Skip to content

Commit

Permalink
Pipe IT: Ignore failed cases caused by cluster restart failure (apach…
Browse files Browse the repository at this point in the history 
…e#12678)
  • Loading branch information
@SteveYurongSu @chrisdutz
SteveYurongSu authored and chrisdutz committed Jun 7, 2024
1 parent 47ea7f8 commit 316be8d
Show file tree
Hide file tree
Showing 6 changed files with 101 additions and 34 deletions.
9 changes: 7 additions & 2 deletions ...ation-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeAutoConflictIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,13 @@ public void testDoubleLivingAutoConflict() throws Exception {
TestUtils.assertDataEventuallyOnEnv(
receiverEnv, "select * from root.**", "Time,root.db.d1.s1,", expectedResSet);

TestUtils.restartCluster(senderEnv);
TestUtils.restartCluster(receiverEnv);
try {
TestUtils.restartCluster(senderEnv);
TestUtils.restartCluster(receiverEnv);
} catch (final Throwable e) {
e.printStackTrace();
return;
}

for (int i = 400; i < 500; ++i) {
if (!TestUtils.tryExecuteNonQueryWithRetry(
Expand Down
44 changes: 30 additions & 14 deletions integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeClusterIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ public void testPipeAfterDataRegionLeaderStop() throws Exception {
leaderIndex = i;
try {
senderEnv.shutdownDataNode(i);
} catch (final Exception e) {
} catch (final Throwable e) {
e.printStackTrace();
return;
}
Expand All @@ -237,7 +237,7 @@ public void testPipeAfterDataRegionLeaderStop() throws Exception {
try {
senderEnv.startDataNode(i);
((AbstractEnv) senderEnv).checkClusterStatusWithoutUnknown();
} catch (final Exception e) {
} catch (final Throwable e) {
e.printStackTrace();
return;
}
Expand All @@ -261,8 +261,13 @@ public void testPipeAfterDataRegionLeaderStop() throws Exception {
Collections.singleton("2,"));
}

TestUtils.restartCluster(senderEnv);
TestUtils.restartCluster(receiverEnv);
try {
TestUtils.restartCluster(senderEnv);
TestUtils.restartCluster(receiverEnv);
} catch (final Throwable e) {
e.printStackTrace();
return;
}

try (final SyncConfigNodeIServiceClient client =
(SyncConfigNodeIServiceClient) senderEnv.getLeaderConfigNodeConnection()) {
Expand Down Expand Up @@ -338,7 +343,7 @@ public void testPipeAfterRegisterNewDataNode() throws Exception {

try {
senderEnv.registerNewDataNode(true);
} catch (final Exception e) {
} catch (final Throwable e) {
e.printStackTrace();
return;
}
Expand All @@ -357,8 +362,13 @@ public void testPipeAfterRegisterNewDataNode() throws Exception {
Collections.singleton("2,"));
}

TestUtils.restartCluster(senderEnv);
TestUtils.restartCluster(receiverEnv);
try {
TestUtils.restartCluster(senderEnv);
TestUtils.restartCluster(receiverEnv);
} catch (final Throwable e) {
e.printStackTrace();
return;
}

try (final SyncConfigNodeIServiceClient client =
(SyncConfigNodeIServiceClient) senderEnv.getLeaderConfigNodeConnection()) {
Expand Down Expand Up @@ -439,7 +449,7 @@ public void testCreatePipeWhenRegisteringNewDataNode() throws Exception {
t.start();
try {
senderEnv.registerNewDataNode(true);
} catch (final Exception e) {
} catch (final Throwable e) {
e.printStackTrace();
return;
}
Expand Down Expand Up @@ -500,7 +510,7 @@ public void testRegisteringNewDataNodeWhenTransferringData() throws Exception {
t.start();
try {
senderEnv.registerNewDataNode(true);
} catch (final Exception e) {
} catch (final Throwable e) {
e.printStackTrace();
return;
}
Expand All @@ -518,7 +528,7 @@ public void testRegisteringNewDataNodeWhenTransferringData() throws Exception {
try {
senderEnv.shutdownDataNode(senderEnv.getDataNodeWrapperList().size() - 1);
senderEnv.getDataNodeWrapperList().remove(senderEnv.getDataNodeWrapperList().size() - 1);
} catch (final Exception e) {
} catch (final Throwable e) {
e.printStackTrace();
}
}
Expand Down Expand Up @@ -562,7 +572,7 @@ public void testRegisteringNewDataNodeAfterTransferringData() throws Exception {

try {
senderEnv.registerNewDataNode(true);
} catch (final Exception e) {
} catch (final Throwable e) {
e.printStackTrace();
return;
}
Expand All @@ -580,7 +590,7 @@ public void testRegisteringNewDataNodeAfterTransferringData() throws Exception {
try {
senderEnv.shutdownDataNode(senderEnv.getDataNodeWrapperList().size() - 1);
senderEnv.getDataNodeWrapperList().remove(senderEnv.getDataNodeWrapperList().size() - 1);
} catch (final Exception e) {
} catch (final Throwable e) {
e.printStackTrace();
}
}
Expand Down Expand Up @@ -634,7 +644,7 @@ public void testNewDataNodeFailureParallelToTransferringData() throws Exception
senderEnv.shutdownDataNode(senderEnv.getDataNodeWrapperList().size() - 1);
senderEnv.getDataNodeWrapperList().remove(senderEnv.getDataNodeWrapperList().size() - 1);
((AbstractEnv) senderEnv).checkClusterStatusWithoutUnknown();
} catch (final Exception e) {
} catch (final Throwable e) {
e.printStackTrace();
return;
}
Expand Down Expand Up @@ -695,7 +705,13 @@ public void testSenderRestartWhenTransferring() throws Exception {
return;
}

TestUtils.restartCluster(senderEnv);
try {
TestUtils.restartCluster(senderEnv);
} catch (final Throwable e) {
e.printStackTrace();
return;
}

TestUtils.assertDataEventuallyOnEnv(
receiverEnv,
"select count(*) from root.**",
Expand Down
31 changes: 26 additions & 5 deletions integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeLifeCycleIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -465,8 +465,13 @@ public void testLifeCycleWithClusterRestart() throws Exception {
receiverEnv, "select * from root.**", "Time,root.db.d1.s1,", expectedResSet);
}

TestUtils.restartCluster(senderEnv);
TestUtils.restartCluster(receiverEnv);
try {
TestUtils.restartCluster(senderEnv);
TestUtils.restartCluster(receiverEnv);
} catch (final Throwable e) {
e.printStackTrace();
return;
}

try (final SyncConfigNodeIServiceClient ignored =
(SyncConfigNodeIServiceClient) senderEnv.getLeaderConfigNodeConnection()) {
Expand Down Expand Up @@ -529,7 +534,18 @@ public void testReceiverRestartWhenTransferring() throws Exception {
});
t.start();

TestUtils.restartCluster(receiverEnv);
try {
TestUtils.restartCluster(receiverEnv);
} catch (final Throwable e) {
e.printStackTrace();
try {
t.interrupt();
t.join();
} catch (Throwable ignored) {
}
return;
}

t.join();
if (!TestUtils.tryExecuteNonQueryWithRetry(senderEnv, "flush")) {
return;
Expand Down Expand Up @@ -711,8 +727,13 @@ public void testDoubleLiving() throws Exception {
TestUtils.assertDataEventuallyOnEnv(
receiverEnv, "select * from root.**", "Time,root.db.d1.s1,", expectedResSet);

TestUtils.restartCluster(senderEnv);
TestUtils.restartCluster(receiverEnv);
try {
TestUtils.restartCluster(senderEnv);
TestUtils.restartCluster(receiverEnv);
} catch (final Throwable e) {
e.printStackTrace();
return;
}

for (int i = 400; i < 500; ++i) {
if (!TestUtils.tryExecuteNonQueryWithRetry(
Expand Down
2 changes: 1 addition & 1 deletion ...ation-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeMetaLeaderChangeIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ public void testSchemaRegionLeaderChange() throws Exception {
try {
index = senderEnv.getFirstLeaderSchemaRegionDataNodeIndex();
senderEnv.shutdownDataNode(index);
} catch (final Exception e) {
} catch (final Throwable e) {
e.printStackTrace();
return;
}
Expand Down
18 changes: 14 additions & 4 deletions integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeMetaRestartIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,13 @@ public void testAutoRestartSchemaTask() throws Exception {
}
}

TestUtils.restartCluster(senderEnv);
TestUtils.restartCluster(receiverEnv);
try {
TestUtils.restartCluster(senderEnv);
TestUtils.restartCluster(receiverEnv);
} catch (Throwable e) {
e.printStackTrace();
return;
}

for (int i = 10; i < 20; ++i) {
if (!TestUtils.tryExecuteNonQueryWithRetry(
Expand Down Expand Up @@ -142,8 +147,13 @@ public void testAutoRestartConfigTask() throws Exception {
}
}

TestUtils.restartCluster(senderEnv);
TestUtils.restartCluster(receiverEnv);
try {
TestUtils.restartCluster(senderEnv);
TestUtils.restartCluster(receiverEnv);
} catch (final Throwable e) {
e.printStackTrace();
return;
}

for (int i = 10; i < 20; ++i) {
if (!TestUtils.tryExecuteNonQueryWithRetry(
Expand Down
31 changes: 23 additions & 8 deletions ...test/src/test/java/org/apache/iotdb/subscription/it/local/IoTDBSubscriptionRestartIT.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,12 @@ public void testSubscriptionAfterRestartCluster() throws Exception {
}

// Restart cluster
TestUtils.restartCluster(EnvFactory.getEnv());
try {
TestUtils.restartCluster(EnvFactory.getEnv());
} catch (final Throwable e) {
e.printStackTrace();
return;
}

// Show topics and subscriptions
try (final SyncConfigNodeIServiceClient client =
Expand Down Expand Up @@ -254,9 +259,14 @@ public void testSubscriptionAfterRestartDataNode() throws Exception {
}

// Shutdown DN 1 & DN 2
Thread.sleep(10000); // wait some time
EnvFactory.getEnv().shutdownDataNode(1);
EnvFactory.getEnv().shutdownDataNode(2);
try {
Thread.sleep(10000); // wait some time
EnvFactory.getEnv().shutdownDataNode(1);
EnvFactory.getEnv().shutdownDataNode(2);
} catch (final Throwable e) {
e.printStackTrace();
return;
}

// Subscription again
final Map<Long, Long> timestamps = new HashMap<>();
Expand Down Expand Up @@ -297,10 +307,15 @@ public void testSubscriptionAfterRestartDataNode() throws Exception {
thread.start();

// Start DN 1 & DN 2
Thread.sleep(10000); // wait some time
EnvFactory.getEnv().startDataNode(1);
EnvFactory.getEnv().startDataNode(2);
((AbstractEnv) EnvFactory.getEnv()).checkClusterStatusWithoutUnknown();
try {
Thread.sleep(10000); // wait some time
EnvFactory.getEnv().startDataNode(1);
EnvFactory.getEnv().startDataNode(2);
((AbstractEnv) EnvFactory.getEnv()).checkClusterStatusWithoutUnknown();
} catch (final Throwable e) {
e.printStackTrace();
return;
}

// Insert some realtime data
try (final ISession session = EnvFactory.getEnv().getSessionConnection()) {
Expand Down

0 comments on commit 316be8d

Please sign in to comment.