This is an automated email from the ASF dual-hosted git repository. tison pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/zookeeper.git
The following commit(s) were added to refs/heads/master by this push: new bf7170424 ZOOKEEPER-4924: Fix double "the" word typos (#2251) bf7170424 is described below commit bf71704249f447601926d96592075809dcb1e8e9 Author: SSSDNSY <736259...@qq.com> AuthorDate: Wed Apr 30 11:13:58 2025 +0800 ZOOKEEPER-4924: Fix double "the" word typos (#2251) --- .../apache/zookeeper/server/embedded/ZooKeeperServerEmbeddedImpl.java | 2 +- .../src/main/java/org/apache/zookeeper/server/quorum/QuorumPeer.java | 2 +- .../main/java/org/apache/zookeeper/server/quorum/QuorumPeerMain.java | 2 +- .../src/test/java/org/apache/zookeeper/server/ZxidRolloverTest.java | 2 +- .../src/test/java/org/apache/zookeeper/server/quorum/WatchLeakTest.java | 2 +- .../src/test/java/org/apache/zookeeper/test/ClientPortBindTest.java | 2 +- .../src/test/java/org/apache/zookeeper/test/RecoveryTest.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/server/embedded/ZooKeeperServerEmbeddedImpl.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/embedded/ZooKeeperServerEmbeddedImpl.java index 60070e66f..fb9e5eb6c 100644 --- a/zookeeper-server/src/main/java/org/apache/zookeeper/server/embedded/ZooKeeperServerEmbeddedImpl.java +++ b/zookeeper-server/src/main/java/org/apache/zookeeper/server/embedded/ZooKeeperServerEmbeddedImpl.java @@ -116,7 +116,7 @@ public void start() { } }; - // Start and schedule the the purge task + // Start and schedule the purge task purgeMgr = new DatadirCleanupManager(config .getDataDir(), config.getDataLogDir(), config .getSnapRetainCount(), config.getPurgeIntervalInMs()); diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumPeer.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumPeer.java index 786450d35..9a18d59d4 100644 --- a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumPeer.java +++ b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumPeer.java @@ -1570,7 +1570,7 @@ public void run() { LOG.warn("Unexpected exception", e); setPeerState(ServerState.LOOKING); } finally { - // If the thread is in the the grace period, interrupt + // If the thread is in the grace period, interrupt // to come out of waiting. roZkMgr.interrupt(); roZk.shutdown(); diff --git a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumPeerMain.java b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumPeerMain.java index 8a5bb9ccd..59b7481ad 100644 --- a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumPeerMain.java +++ b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumPeerMain.java @@ -125,7 +125,7 @@ protected void initializeAndRun(String[] args) throws ConfigException, IOExcepti config.parse(args[0]); } - // Start and schedule the the purge task + // Start and schedule the purge task DatadirCleanupManager purgeMgr = new DatadirCleanupManager( config.getDataDir(), config.getDataLogDir(), diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/ZxidRolloverTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/ZxidRolloverTest.java index 031ccc2f7..0081b1331 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/ZxidRolloverTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/ZxidRolloverTest.java @@ -192,7 +192,7 @@ private void shutdown(int idx) throws Exception { assertTrue(ClientBase.waitForServerDown("127.0.0.1:" + peer.clientPort, ClientBase.CONNECTION_TIMEOUT), "Waiting for server down"); - // if idx is the the leader then everyone will get disconnected, + // if idx is the leader then everyone will get disconnected, // otherwise if idx is a follower then just that client will get // disconnected if (idx == idxLeader) { diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/WatchLeakTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/WatchLeakTest.java index 8db90a248..228527980 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/WatchLeakTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/server/quorum/WatchLeakTest.java @@ -128,7 +128,7 @@ public Boolean answer(InvocationOnMock invocation) throws Throwable { // OK, now the follower knows that the session is valid or invalid, let's try // to send the watches nioCnxn.doIO(sk); - // wait for the the request processor to do his job + // wait for the request processor to do his job Thread.sleep(1000L); LOG.info("Watches processed"); // If session has not been validated, there must be NO watches diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/ClientPortBindTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ClientPortBindTest.java index 5061c5f4d..99f195b36 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/ClientPortBindTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/ClientPortBindTest.java @@ -84,7 +84,7 @@ public void testBindByAddress(@TempDir File tmpDir) throws Exception { ServerCnxnFactory f = ServerCnxnFactory.createFactory(new InetSocketAddress(bindAddress, PORT), -1); f.startup(zks); - LOG.info("starting up the the server, waiting"); + LOG.info("starting up the server, waiting"); assertTrue(ClientBase.waitForServerUp(HOSTPORT, CONNECTION_TIMEOUT), "waiting for server up"); ZooKeeper zk = ClientBase.createZKClient(HOSTPORT); diff --git a/zookeeper-server/src/test/java/org/apache/zookeeper/test/RecoveryTest.java b/zookeeper-server/src/test/java/org/apache/zookeeper/test/RecoveryTest.java index 3f8fa9add..fb38dd4b9 100644 --- a/zookeeper-server/src/test/java/org/apache/zookeeper/test/RecoveryTest.java +++ b/zookeeper-server/src/test/java/org/apache/zookeeper/test/RecoveryTest.java @@ -73,7 +73,7 @@ public void testRecovery(@TempDir File tmpDir) throws Exception { final int PORT = Integer.parseInt(HOSTPORT.split(":")[1]); ServerCnxnFactory f = ServerCnxnFactory.createFactory(PORT, -1); f.startup(zks); - LOG.info("starting up the the server, waiting"); + LOG.info("starting up the server, waiting"); assertTrue(ClientBase.waitForServerUp(HOSTPORT, CONNECTION_TIMEOUT), "waiting for server up");