This is an automated email from the ASF dual-hosted git repository.
rong 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 46319bd403b Pipe IT: Return directly when SQL retry failed in IT to
avoid potential fake failure interference (#12468)
46319bd403b is described below
commit 46319bd403b6ae2fd3afc72c48232e8cf4f6d9b5
Author: Caideyipi <[email protected]>
AuthorDate: Mon May 6 20:12:48 2024 +0800
Pipe IT: Return directly when SQL retry failed in IT to avoid potential
fake failure interference (#12468)
---
.../it/manual/IoTDBPipeMetaLeaderChangeIT.java | 32 ++++++++--------------
.../pipe/it/manual/IoTDBPipeMetaRestartIT.java | 28 +++++++------------
2 files changed, 22 insertions(+), 38 deletions(-)
diff --git
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeMetaLeaderChangeIT.java
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeMetaLeaderChangeIT.java
index 7aed42e9371..5928e6e33c7 100644
---
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeMetaLeaderChangeIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeMetaLeaderChangeIT.java
@@ -100,33 +100,29 @@ public class IoTDBPipeMetaLeaderChangeIT extends
AbstractPipeDualManualIT {
TSStatusCode.SUCCESS_STATUS.getStatusCode(),
client.startPipe("testPipe").getCode());
}
- int successCount = 0;
for (int i = 0; i < 10; ++i) {
- if (TestUtils.tryExecuteNonQueryWithRetry(
+ if (!TestUtils.tryExecuteNonQueryWithRetry(
senderEnv, String.format("create database root.ln%s", i))) {
- ++successCount;
+ return;
}
}
try {
senderEnv.shutdownConfigNode(senderEnv.getLeaderConfigNodeIndex());
- } catch (Exception e) {
+ } catch (final Exception e) {
e.printStackTrace();
return;
}
for (int i = 10; i < 20; ++i) {
- if (TestUtils.tryExecuteNonQueryWithRetry(
+ if (!TestUtils.tryExecuteNonQueryWithRetry(
senderEnv, String.format("create database root.ln%s", i))) {
- ++successCount;
+ return;
}
}
TestUtils.assertDataEventuallyOnEnv(
- receiverEnv,
- "count databases",
- "count,",
- Collections.singleton(String.format("%d,", successCount)));
+ receiverEnv, "count databases", "count,",
Collections.singleton("20,"));
}
@Test
@@ -163,14 +159,13 @@ public class IoTDBPipeMetaLeaderChangeIT extends
AbstractPipeDualManualIT {
TSStatusCode.SUCCESS_STATUS.getStatusCode(),
client.startPipe("testPipe").getCode());
}
- int successCount = 0;
for (int i = 0; i < 10; ++i) {
- if (TestUtils.tryExecuteNonQueryWithRetry(
+ if (!TestUtils.tryExecuteNonQueryWithRetry(
senderEnv,
String.format(
"create timeseries root.ln.wf01.GPS.status%s with
datatype=BOOLEAN,encoding=PLAIN",
i))) {
- ++successCount;
+ return;
}
}
@@ -178,26 +173,23 @@ public class IoTDBPipeMetaLeaderChangeIT extends
AbstractPipeDualManualIT {
try {
index = senderEnv.getFirstLeaderSchemaRegionDataNodeIndex();
senderEnv.shutdownDataNode(index);
- } catch (Exception e) {
+ } catch (final Exception e) {
e.printStackTrace();
return;
}
for (int i = 10; i < 20; ++i) {
- if (TestUtils.tryExecuteNonQueryOnSpecifiedDataNodeWithRetry(
+ if (!TestUtils.tryExecuteNonQueryOnSpecifiedDataNodeWithRetry(
senderEnv,
senderEnv.getDataNodeWrapper(index == 0 ? 1 : 0),
String.format(
"create timeseries root.ln.wf01.GPS.status%s with
datatype=BOOLEAN,encoding=PLAIN",
i))) {
- ++successCount;
+ return;
}
}
TestUtils.assertDataEventuallyOnEnv(
- receiverEnv,
- "count timeseries",
- "count(timeseries),",
- Collections.singleton(String.format("%d,", successCount)));
+ receiverEnv, "count timeseries", "count(timeseries),",
Collections.singleton("20,"));
}
}
diff --git
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeMetaRestartIT.java
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeMetaRestartIT.java
index 5cdd01df6a2..8c19a5e2160 100644
---
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeMetaRestartIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/manual/IoTDBPipeMetaRestartIT.java
@@ -74,14 +74,13 @@ public class IoTDBPipeMetaRestartIT extends
AbstractPipeDualManualIT {
TSStatusCode.SUCCESS_STATUS.getStatusCode(),
client.startPipe("testPipe").getCode());
}
- int successCount = 0;
for (int i = 0; i < 10; ++i) {
- if (TestUtils.tryExecuteNonQueryWithRetry(
+ if (!TestUtils.tryExecuteNonQueryWithRetry(
senderEnv,
String.format(
"create timeseries root.ln.wf01.GPS.status%s with
datatype=BOOLEAN,encoding=PLAIN",
i))) {
- ++successCount;
+ return;
}
}
@@ -89,20 +88,17 @@ public class IoTDBPipeMetaRestartIT extends
AbstractPipeDualManualIT {
TestUtils.restartCluster(receiverEnv);
for (int i = 10; i < 20; ++i) {
- if (TestUtils.tryExecuteNonQueryWithRetry(
+ if (!TestUtils.tryExecuteNonQueryWithRetry(
senderEnv,
String.format(
"create timeseries root.ln.wf01.GPS.status%s with
datatype=BOOLEAN,encoding=PLAIN",
i))) {
- ++successCount;
+ return;
}
}
TestUtils.assertDataEventuallyOnEnv(
- receiverEnv,
- "count timeseries",
- "count(timeseries),",
- Collections.singleton(String.format("%d,", successCount)));
+ receiverEnv, "count timeseries", "count(timeseries),",
Collections.singleton("20,"));
}
@Test
@@ -139,11 +135,10 @@ public class IoTDBPipeMetaRestartIT extends
AbstractPipeDualManualIT {
TSStatusCode.SUCCESS_STATUS.getStatusCode(),
client.startPipe("testPipe").getCode());
}
- int successCount = 0;
for (int i = 0; i < 10; ++i) {
- if (TestUtils.tryExecuteNonQueryWithRetry(
+ if (!TestUtils.tryExecuteNonQueryWithRetry(
senderEnv, String.format("create database root.ln%s", i))) {
- ++successCount;
+ return;
}
}
@@ -151,16 +146,13 @@ public class IoTDBPipeMetaRestartIT extends
AbstractPipeDualManualIT {
TestUtils.restartCluster(receiverEnv);
for (int i = 10; i < 20; ++i) {
- if (TestUtils.tryExecuteNonQueryWithRetry(
+ if (!TestUtils.tryExecuteNonQueryWithRetry(
senderEnv, String.format("create database root.ln%s", i))) {
- ++successCount;
+ return;
}
}
TestUtils.assertDataEventuallyOnEnv(
- receiverEnv,
- "count databases",
- "count,",
- Collections.singleton(String.format("%d,", successCount)));
+ receiverEnv, "count databases", "count,",
Collections.singleton("20,"));
}
}
