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 19067243d0c Subscription IT: fix
IoTDBConsumer2With1TopicShareProcessTsfileIT (#15110)
19067243d0c is described below
commit 19067243d0c5fc94f2248828b5bf8db63b170db9
Author: VGalaxies <[email protected]>
AuthorDate: Mon Mar 17 23:02:04 2025 +0800
Subscription IT: fix IoTDBConsumer2With1TopicShareProcessTsfileIT (#15110)
---
.../IoTDBConsumer2With1TopicShareProcessTsfileIT.java | 14 ++++++--------
.../java/org/apache/iotdb/commons/conf/CommonConfig.java | 2 +-
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git
a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/multi/IoTDBConsumer2With1TopicShareProcessTsfileIT.java
b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/multi/IoTDBConsumer2With1TopicShareProcessTsfileIT.java
index 23f06cc6ad1..62fdf9a61cc 100644
---
a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/multi/IoTDBConsumer2With1TopicShareProcessTsfileIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/regression/pullconsumer/multi/IoTDBConsumer2With1TopicShareProcessTsfileIT.java
@@ -50,7 +50,6 @@ import static
org.apache.iotdb.subscription.it.IoTDBSubscriptionITConstant.AWAIT
* format: tsfile
* pattern:device
* Same group pull consumer share progress
- * About 1/5 chance, over 1000
*/
@RunWith(IoTDBTestRunner.class)
@Category({MultiClusterIT2SubscriptionRegressionConsumer.class})
@@ -136,17 +135,16 @@ public class IoTDBConsumer2With1TopicShareProcessTsfileIT
extends AbstractSubscr
Thread thread =
new Thread(
() -> {
- for (int i = 0; i < 200; i++) {
+ long timestamp = 1706659200000L; // 2024-01-31 08:00:00+08:00
+ for (int i = 0; i < 20; i++) {
try {
- insert_data(1706659200000L);
- Thread.sleep(1000);
+ insert_data(timestamp);
} catch (IoTDBConnectionException e) {
throw new RuntimeException(e);
} catch (StatementExecutionException e) {
throw new RuntimeException(e);
- } catch (InterruptedException e) {
- throw new RuntimeException(e);
}
+ timestamp += 20000;
}
});
AtomicInteger rowCount1 = new AtomicInteger(0);
@@ -177,14 +175,14 @@ public class IoTDBConsumer2With1TopicShareProcessTsfileIT
extends AbstractSubscr
thread2.join();
thread.join();
- System.out.println("src :" + getCount(session_src, "select count(s_0) from
" + device));
+ System.out.println("src=" + getCount(session_src, "select count(s_0) from
" + device));
System.out.println("rowCount1=" + rowCount1.get());
System.out.println("rowCount2=" + rowCount2.get());
AWAIT.untilAsserted(
() -> {
assertGte(
rowCount1.get() + rowCount2.get(),
- 1000,
+ getCount(session_src, "select count(s_0) from " + device),
"consumer share process rowCount1="
+ rowCount1.get()
+ " rowCount2="
diff --git
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java
index d37e1c1eda9..4b814a26386 100644
---
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java
+++
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java
@@ -261,7 +261,7 @@ public class CommonConfig {
private int pipeMaxAllowedHistoricalTsFilePerDataRegion = 100;
private int pipeMaxAllowedPendingTsFileEpochPerDataRegion = 5;
- private int pipeMaxAllowedPinnedMemTableCount = 10; // per data region
+ private int pipeMaxAllowedPinnedMemTableCount = 5; // per data region
private long pipeMaxAllowedLinkedTsFileCount = 300;
private float pipeMaxAllowedLinkedDeletedTsFileDiskUsagePercentage = 0.1F;
private long pipeStuckRestartIntervalSeconds = 120;
