You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ta...@apache.org on 2023/07/13 12:37:59 UTC
[iotdb] branch master updated: [IOTDB-6061] Fix the instability failure caused by initServer in IoTConsensus UT not binding to the corresponding port (#10540)
This is an automated email from the ASF dual-hosted git repository.
tanxinyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new dc8b9e6538d [IOTDB-6061] Fix the instability failure caused by initServer in IoTConsensus UT not binding to the corresponding port (#10540)
dc8b9e6538d is described below
commit dc8b9e6538dca3726263878ab8f701c7c41bba18
Author: Xiangpeng Hu <65...@users.noreply.github.com>
AuthorDate: Thu Jul 13 20:37:53 2023 +0800
[IOTDB-6061] Fix the instability failure caused by initServer in IoTConsensus UT not binding to the corresponding port (#10540)
---
.../java/org/apache/iotdb/consensus/iot/ReplicateTest.java | 7 +++++--
.../java/org/apache/iotdb/consensus/iot/StabilityTest.java | 13 ++++++++-----
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/iotdb-core/consensus/src/test/java/org/apache/iotdb/consensus/iot/ReplicateTest.java b/iotdb-core/consensus/src/test/java/org/apache/iotdb/consensus/iot/ReplicateTest.java
index 9aae908b22a..979ea0c09fe 100644
--- a/iotdb-core/consensus/src/test/java/org/apache/iotdb/consensus/iot/ReplicateTest.java
+++ b/iotdb-core/consensus/src/test/java/org/apache/iotdb/consensus/iot/ReplicateTest.java
@@ -44,6 +44,7 @@ import java.net.ServerSocket;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import java.util.concurrent.TimeUnit;
public class ReplicateTest {
private static final long CHECK_POINT_GAP = 500;
@@ -51,6 +52,8 @@ public class ReplicateTest {
private final ConsensusGroupId gid = new DataRegionId(1);
+ private static final long timeout = TimeUnit.SECONDS.toMillis(300);
+
private final List<Peer> peers =
Arrays.asList(
new Peer(gid, 1, new TEndPoint("127.0.0.1", 6000)),
@@ -253,7 +256,7 @@ public class ReplicateTest {
private static void waitPortAvailable(int port) {
long start = System.currentTimeMillis();
- while (System.currentTimeMillis() - start < 60 * 1000) {
+ while (System.currentTimeMillis() - start < timeout) {
try (ServerSocket ignored = new ServerSocket(port)) {
return;
} catch (IOException e) {
@@ -265,6 +268,6 @@ public class ReplicateTest {
}
}
}
- Assert.fail(String.format("can not bind port %d after 60s", port));
+ Assert.fail(String.format("can not bind port %d after 300s", port));
}
}
diff --git a/iotdb-core/consensus/src/test/java/org/apache/iotdb/consensus/iot/StabilityTest.java b/iotdb-core/consensus/src/test/java/org/apache/iotdb/consensus/iot/StabilityTest.java
index 5f04af6ee04..5afee66ee1a 100644
--- a/iotdb-core/consensus/src/test/java/org/apache/iotdb/consensus/iot/StabilityTest.java
+++ b/iotdb-core/consensus/src/test/java/org/apache/iotdb/consensus/iot/StabilityTest.java
@@ -49,13 +49,15 @@ public class StabilityTest {
private IConsensus consensusImpl;
+ private final int basePort = 9000;
+
public void constructConsensus() throws IOException {
consensusImpl =
ConsensusFactory.getConsensusImpl(
ConsensusFactory.IOT_CONSENSUS,
ConsensusConfig.newBuilder()
.setThisNodeId(1)
- .setThisNode(new TEndPoint("0.0.0.0", 9000))
+ .setThisNode(new TEndPoint("0.0.0.0", basePort))
.setStorageDir(storageDir.getAbsolutePath())
.setConsensusGroupType(TConsensusGroupType.DataRegion)
.build(),
@@ -90,7 +92,7 @@ public class StabilityTest {
public void peerTest() throws Exception {
consensusImpl.createPeer(
dataRegionId,
- Collections.singletonList(new Peer(dataRegionId, 1, new TEndPoint("0.0.0.0", 9000))));
+ Collections.singletonList(new Peer(dataRegionId, 1, new TEndPoint("0.0.0.0", basePort))));
consensusImpl.deletePeer(dataRegionId);
@@ -102,7 +104,8 @@ public class StabilityTest {
ConsensusGenericResponse response =
consensusImpl.createPeer(
dataRegionId,
- Collections.singletonList(new Peer(dataRegionId, 1, new TEndPoint("0.0.0.0", 9000))));
+ Collections.singletonList(
+ new Peer(dataRegionId, 1, new TEndPoint("0.0.0.0", basePort))));
Assert.assertTrue(response.isSuccess());
consensusImpl.deletePeer(dataRegionId);
}
@@ -110,7 +113,7 @@ public class StabilityTest {
public void snapshotTest() throws IOException {
consensusImpl.createPeer(
dataRegionId,
- Collections.singletonList(new Peer(dataRegionId, 1, new TEndPoint("0.0.0.0", 9000))));
+ Collections.singletonList(new Peer(dataRegionId, 1, new TEndPoint("0.0.0.0", basePort))));
consensusImpl.triggerSnapshot(dataRegionId);
File dataDir = new File(IoTConsensus.buildPeerDir(storageDir, dataRegionId));
@@ -135,7 +138,7 @@ public class StabilityTest {
public void snapshotUpgradeTest() throws Exception {
consensusImpl.createPeer(
dataRegionId,
- Collections.singletonList(new Peer(dataRegionId, 1, new TEndPoint("0.0.0.0", 9000))));
+ Collections.singletonList(new Peer(dataRegionId, 1, new TEndPoint("0.0.0.0", basePort))));
consensusImpl.triggerSnapshot(dataRegionId);
long oldSnapshotIndex = System.currentTimeMillis();
String oldSnapshotDirName =