This is an automated email from the ASF dual-hosted git repository.
justinchen pushed a commit to branch dev/1.3
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/dev/1.3 by this push:
new 9345d9ed297 [To dev/1.3] Pipe: Fixed the missing bans for pipe memory
management (#16088)
9345d9ed297 is described below
commit 9345d9ed297114878d5cd61a217cb6c8cdbc957c
Author: Caideyipi <[email protected]>
AuthorDate: Mon Aug 4 12:31:31 2025 +0800
[To dev/1.3] Pipe: Fixed the missing bans for pipe memory management
(#16088)
---
.../apache/iotdb/pipe/it/single/AbstractPipeSingleIT.java | 5 ++++-
.../subscription/it/dual/AbstractSubscriptionDualIT.java | 12 ++++++++++--
.../it/dual/IoTDBSubscriptionConsumerGroupIT.java | 12 ++++++++++--
.../it/dual/IoTDBSubscriptionTimePrecisionIT.java | 12 ++++++++++--
.../iotdb/subscription/it/dual/IoTDBSubscriptionTopicIT.java | 12 ++++++++++--
.../subscription/it/triple/AbstractSubscriptionTripleIT.java | 12 ++++++++++--
6 files changed, 54 insertions(+), 11 deletions(-)
diff --git
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/single/AbstractPipeSingleIT.java
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/single/AbstractPipeSingleIT.java
index 9a484426d76..324fc529b5a 100644
---
a/integration-test/src/test/java/org/apache/iotdb/pipe/it/single/AbstractPipeSingleIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/pipe/it/single/AbstractPipeSingleIT.java
@@ -36,7 +36,10 @@ abstract class AbstractPipeSingleIT {
env.getConfig().getCommonConfig().setAutoCreateSchemaEnabled(true);
// 10 min, assert that the operations will not time out
env.getConfig().getCommonConfig().setDnConnectionTimeoutMs(600000);
- env.getConfig().getCommonConfig().setIsPipeEnableMemoryCheck(false);
+ env.getConfig()
+ .getCommonConfig()
+ .setPipeMemoryManagementEnabled(false)
+ .setIsPipeEnableMemoryCheck(false);
env.initClusterEnvironment();
}
diff --git
a/integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/AbstractSubscriptionDualIT.java
b/integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/AbstractSubscriptionDualIT.java
index 5e61607ff32..873334ea139 100644
---
a/integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/AbstractSubscriptionDualIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/AbstractSubscriptionDualIT.java
@@ -59,8 +59,16 @@ public abstract class AbstractSubscriptionDualIT extends
AbstractSubscriptionIT
senderEnv.getConfig().getCommonConfig().setDnConnectionTimeoutMs(600000);
receiverEnv.getConfig().getCommonConfig().setDnConnectionTimeoutMs(600000);
- senderEnv.getConfig().getCommonConfig().setIsPipeEnableMemoryCheck(false);
-
receiverEnv.getConfig().getCommonConfig().setIsPipeEnableMemoryCheck(false);
+ senderEnv
+ .getConfig()
+ .getCommonConfig()
+ .setPipeMemoryManagementEnabled(false)
+ .setIsPipeEnableMemoryCheck(false);
+ receiverEnv
+ .getConfig()
+ .getCommonConfig()
+ .setPipeMemoryManagementEnabled(false)
+ .setIsPipeEnableMemoryCheck(false);
}
@Override
diff --git
a/integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/IoTDBSubscriptionConsumerGroupIT.java
b/integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/IoTDBSubscriptionConsumerGroupIT.java
index 5ad46b10977..63ec58d134d 100644
---
a/integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/IoTDBSubscriptionConsumerGroupIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/IoTDBSubscriptionConsumerGroupIT.java
@@ -120,8 +120,16 @@ public class IoTDBSubscriptionConsumerGroupIT extends
AbstractSubscriptionDualIT
senderEnv.getConfig().getCommonConfig().setIsPipeEnableMemoryCheck(false);
// Enable air gap receiver
-
receiverEnv.getConfig().getCommonConfig().setPipeAirGapReceiverEnabled(true);
-
receiverEnv.getConfig().getCommonConfig().setIsPipeEnableMemoryCheck(false);
+ receiverEnv
+ .getConfig()
+ .getCommonConfig()
+ .setPipeMemoryManagementEnabled(false)
+ .setPipeAirGapReceiverEnabled(true);
+ receiverEnv
+ .getConfig()
+ .getCommonConfig()
+ .setPipeMemoryManagementEnabled(false)
+ .setIsPipeEnableMemoryCheck(false);
}
@Override
diff --git
a/integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/IoTDBSubscriptionTimePrecisionIT.java
b/integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/IoTDBSubscriptionTimePrecisionIT.java
index 1939a986c68..9a588643699 100644
---
a/integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/IoTDBSubscriptionTimePrecisionIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/IoTDBSubscriptionTimePrecisionIT.java
@@ -68,9 +68,17 @@ public class IoTDBSubscriptionTimePrecisionIT extends
AbstractSubscriptionDualIT
// Set timestamp precision to nanosecond
senderEnv.getConfig().getCommonConfig().setTimestampPrecision("ns");
- senderEnv.getConfig().getCommonConfig().setIsPipeEnableMemoryCheck(false);
+ senderEnv
+ .getConfig()
+ .getCommonConfig()
+ .setPipeMemoryManagementEnabled(false)
+ .setIsPipeEnableMemoryCheck(false);
receiverEnv.getConfig().getCommonConfig().setTimestampPrecision("ns");
-
receiverEnv.getConfig().getCommonConfig().setIsPipeEnableMemoryCheck(false);
+ receiverEnv
+ .getConfig()
+ .getCommonConfig()
+ .setPipeMemoryManagementEnabled(false)
+ .setIsPipeEnableMemoryCheck(false);
}
@Test
diff --git
a/integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/IoTDBSubscriptionTopicIT.java
b/integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/IoTDBSubscriptionTopicIT.java
index 37971833b97..e701df2b42d 100644
---
a/integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/IoTDBSubscriptionTopicIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/IoTDBSubscriptionTopicIT.java
@@ -91,9 +91,17 @@ public class IoTDBSubscriptionTopicIT extends
AbstractSubscriptionDualIT {
.setPipeHeartbeatIntervalSecondsForCollectingPipeMeta(30);
senderEnv.getConfig().getCommonConfig().setPipeMetaSyncerInitialSyncDelayMinutes(1);
senderEnv.getConfig().getCommonConfig().setPipeMetaSyncerSyncIntervalMinutes(1);
- senderEnv.getConfig().getCommonConfig().setIsPipeEnableMemoryCheck(false);
+ senderEnv
+ .getConfig()
+ .getCommonConfig()
+ .setPipeMemoryManagementEnabled(false)
+ .setIsPipeEnableMemoryCheck(false);
-
receiverEnv.getConfig().getCommonConfig().setIsPipeEnableMemoryCheck(false);
+ receiverEnv
+ .getConfig()
+ .getCommonConfig()
+ .setPipeMemoryManagementEnabled(false)
+ .setIsPipeEnableMemoryCheck(false);
}
@Test
diff --git
a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/AbstractSubscriptionTripleIT.java
b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/AbstractSubscriptionTripleIT.java
index 6b125222e61..8f43e934c29 100644
---
a/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/AbstractSubscriptionTripleIT.java
+++
b/integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/AbstractSubscriptionTripleIT.java
@@ -78,8 +78,16 @@ public abstract class AbstractSubscriptionTripleIT extends
AbstractSubscriptionI
.setIsPipeEnableMemoryCheck(false)
.setSubscriptionPrefetchTsFileBatchMaxDelayInMs(500)
.setSubscriptionPrefetchTsFileBatchMaxSizeInBytes(32 * 1024);
- receiver1.getConfig().getCommonConfig().setIsPipeEnableMemoryCheck(false);
- receiver2.getConfig().getCommonConfig().setIsPipeEnableMemoryCheck(false);
+ receiver1
+ .getConfig()
+ .getCommonConfig()
+ .setPipeMemoryManagementEnabled(false)
+ .setIsPipeEnableMemoryCheck(false);
+ receiver2
+ .getConfig()
+ .getCommonConfig()
+ .setPipeMemoryManagementEnabled(false)
+ .setIsPipeEnableMemoryCheck(false);
}
@Override
