Skip to content

Commit 6c934ea

Browse files
CaideyipiCaideyipi
committed
Pipe: Fixed the default param of single entry of disruptor queue & Banned memory checks from some missing pipe ITs & Do not check non-user pipes (apache#16069)
* Update CommonConfig.java * refactor * try-fix * test * revert-pom * fix * fix
1 parent 173aa30 commit 6c934ea

28 files changed

Lines changed: 4003 additions & 62 deletions

‎integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppCommonConfig.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,12 @@ public CommonConfig setSchemaRegionPerDataNode(double schemaRegionPerDataNode) {
429429
return this;
430430
}
431431

432+
@Override
433+
public CommonConfig setPipeMemoryManagementEnabled(boolean pipeMemoryManagementEnabled) {
434+
setProperty("pipe_memory_management_enabled", String.valueOf(pipeMemoryManagementEnabled));
435+
return this;
436+
}
437+
432438
@Override
433439
public CommonConfig setIsPipeEnableMemoryCheck(boolean isPipeEnableMemoryCheck) {
434440
setProperty("pipe_enable_memory_checked", String.valueOf(isPipeEnableMemoryCheck));

‎integration-test/src/main/java/org/apache/iotdb/it/env/cluster/config/MppSharedCommonConfig.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -438,6 +438,13 @@ public CommonConfig setSchemaRegionPerDataNode(double schemaRegionPerDataNode) {
438438
return this;
439439
}
440440

441+
@Override
442+
public CommonConfig setPipeMemoryManagementEnabled(boolean pipeMemoryManagementEnabled) {
443+
dnConfig.setPipeMemoryManagementEnabled(pipeMemoryManagementEnabled);
444+
cnConfig.setPipeMemoryManagementEnabled(pipeMemoryManagementEnabled);
445+
return this;
446+
}
447+
441448
@Override
442449
public CommonConfig setIsPipeEnableMemoryCheck(boolean isPipeEnableMemoryCheck) {
443450
dnConfig.setIsPipeEnableMemoryCheck(isPipeEnableMemoryCheck);

‎integration-test/src/main/java/org/apache/iotdb/it/env/remote/config/RemoteCommonConfig.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,11 @@ public CommonConfig setSchemaRegionPerDataNode(double schemaRegionPerDataNode) {
308308
return this;
309309
}
310310

311+
@Override
312+
public CommonConfig setPipeMemoryManagementEnabled(boolean pipeMemoryManagementEnabled) {
313+
return this;
314+
}
315+
311316
@Override
312317
public CommonConfig setIsPipeEnableMemoryCheck(boolean isPipeEnableMemoryCheck) {
313318
return this;

‎integration-test/src/main/java/org/apache/iotdb/itbase/env/CommonConfig.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,8 @@ CommonConfig setEnableAutoLeaderBalanceForIoTConsensus(
138138

139139
CommonConfig setSchemaRegionPerDataNode(double schemaRegionPerDataNode);
140140

141+
CommonConfig setPipeMemoryManagementEnabled(boolean pipeMemoryManagementEnabled);
142+
141143
CommonConfig setIsPipeEnableMemoryCheck(boolean isPipeEnableMemoryCheck);
142144

143145
CommonConfig setPipeAirGapReceiverEnabled(boolean isPipeAirGapReceiverEnabled);

‎integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/AbstractPipeDualAutoIT.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,15 @@ protected void setupConfig() {
4949
.setAutoCreateSchemaEnabled(true)
5050
.setConfigNodeConsensusProtocolClass(ConsensusFactory.RATIS_CONSENSUS)
5151
.setSchemaRegionConsensusProtocolClass(ConsensusFactory.RATIS_CONSENSUS)
52+
.setPipeMemoryManagementEnabled(false)
5253
.setIsPipeEnableMemoryCheck(false);
5354
receiverEnv
5455
.getConfig()
5556
.getCommonConfig()
5657
.setAutoCreateSchemaEnabled(true)
5758
.setConfigNodeConsensusProtocolClass(ConsensusFactory.RATIS_CONSENSUS)
5859
.setSchemaRegionConsensusProtocolClass(ConsensusFactory.RATIS_CONSENSUS)
60+
.setPipeMemoryManagementEnabled(false)
5961
.setIsPipeEnableMemoryCheck(false);
6062

6163
// 10 min, assert that the operations will not time out

‎integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeAutoConflictIT.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ public void setUp() {
6060
.setConfigNodeConsensusProtocolClass(ConsensusFactory.RATIS_CONSENSUS)
6161
.setSchemaRegionConsensusProtocolClass(ConsensusFactory.RATIS_CONSENSUS)
6262
.setDataRegionConsensusProtocolClass(ConsensusFactory.IOT_CONSENSUS)
63+
.setPipeMemoryManagementEnabled(false)
6364
.setIsPipeEnableMemoryCheck(false);
6465
receiverEnv
6566
.getConfig()
@@ -68,6 +69,7 @@ public void setUp() {
6869
.setConfigNodeConsensusProtocolClass(ConsensusFactory.RATIS_CONSENSUS)
6970
.setSchemaRegionConsensusProtocolClass(ConsensusFactory.RATIS_CONSENSUS)
7071
.setDataRegionConsensusProtocolClass(ConsensusFactory.IOT_CONSENSUS)
72+
.setPipeMemoryManagementEnabled(false)
7173
.setIsPipeEnableMemoryCheck(false);
7274

7375
// 10 min, assert that the operations will not time out

‎integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeClusterIT.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ public void setUp() {
7575
.setConfigNodeConsensusProtocolClass(ConsensusFactory.RATIS_CONSENSUS)
7676
.setSchemaRegionConsensusProtocolClass(ConsensusFactory.RATIS_CONSENSUS)
7777
.setDataRegionConsensusProtocolClass(ConsensusFactory.IOT_CONSENSUS)
78+
.setPipeMemoryManagementEnabled(false)
7879
.setIsPipeEnableMemoryCheck(false);
7980

8081
receiverEnv
@@ -86,6 +87,7 @@ public void setUp() {
8687
.setConfigNodeConsensusProtocolClass(ConsensusFactory.RATIS_CONSENSUS)
8788
.setSchemaRegionConsensusProtocolClass(ConsensusFactory.RATIS_CONSENSUS)
8889
.setDataRegionConsensusProtocolClass(ConsensusFactory.IOT_CONSENSUS)
90+
.setPipeMemoryManagementEnabled(false)
8991
.setIsPipeEnableMemoryCheck(false);
9092

9193
// 10 min, assert that the operations will not time out

‎integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeIdempotentIT.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,13 +66,15 @@ public void setUp() {
6666
.setDefaultSchemaRegionGroupNumPerDatabase(1)
6767
.setConfigNodeConsensusProtocolClass(ConsensusFactory.RATIS_CONSENSUS)
6868
.setSchemaRegionConsensusProtocolClass(ConsensusFactory.RATIS_CONSENSUS)
69+
.setPipeMemoryManagementEnabled(false)
6970
.setIsPipeEnableMemoryCheck(false);
7071
receiverEnv
7172
.getConfig()
7273
.getCommonConfig()
7374
.setAutoCreateSchemaEnabled(true)
7475
.setConfigNodeConsensusProtocolClass(ConsensusFactory.RATIS_CONSENSUS)
7576
.setSchemaRegionConsensusProtocolClass(ConsensusFactory.RATIS_CONSENSUS)
77+
.setPipeMemoryManagementEnabled(false)
7678
.setIsPipeEnableMemoryCheck(false);
7779

7880
// 10 min, assert that the operations will not time out

‎integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeProcessorIT.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,15 @@ public void setUp() {
6060
.setTimestampPrecision("ms")
6161
.setConfigNodeConsensusProtocolClass(ConsensusFactory.RATIS_CONSENSUS)
6262
.setSchemaRegionConsensusProtocolClass(ConsensusFactory.RATIS_CONSENSUS)
63+
.setPipeMemoryManagementEnabled(false)
6364
.setIsPipeEnableMemoryCheck(false);
6465
receiverEnv
6566
.getConfig()
6667
.getCommonConfig()
6768
.setAutoCreateSchemaEnabled(true)
6869
.setConfigNodeConsensusProtocolClass(ConsensusFactory.RATIS_CONSENSUS)
6970
.setSchemaRegionConsensusProtocolClass(ConsensusFactory.RATIS_CONSENSUS)
71+
.setPipeMemoryManagementEnabled(false)
7072
.setIsPipeEnableMemoryCheck(false);
7173

7274
// 10 min, assert that the operations will not time out

‎integration-test/src/test/java/org/apache/iotdb/pipe/it/autocreate/IoTDBPipeProtocolIT.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ private void innerSetUp(
7575
.setDataRegionConsensusProtocolClass(dataRegionConsensus)
7676
.setSchemaReplicationFactor(schemaRegionReplicationFactor)
7777
.setDataReplicationFactor(dataRegionReplicationFactor)
78+
.setPipeMemoryManagementEnabled(false)
7879
.setIsPipeEnableMemoryCheck(false);
7980
receiverEnv
8081
.getConfig()
@@ -85,6 +86,7 @@ private void innerSetUp(
8586
.setDataRegionConsensusProtocolClass(dataRegionConsensus)
8687
.setSchemaReplicationFactor(schemaRegionReplicationFactor)
8788
.setDataReplicationFactor(dataRegionReplicationFactor)
89+
.setPipeMemoryManagementEnabled(false)
8890
.setIsPipeEnableMemoryCheck(false);
8991

9092
// 10 min, assert that the operations will not time out

0 commit comments

Comments
 (0)