Skip to content

Commit aa04582

Browse files
authored
Pipe/Subscription: Continue CI Fixing (#16084)
* may-final * revert
1 parent 1dd102f commit aa04582

7 files changed

Lines changed: 67 additions & 16 deletions

File tree

integration-test/src/test/java/org/apache/iotdb/pipe/it/single/AbstractPipeSingleIT.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,11 @@ abstract class AbstractPipeSingleIT {
3333
public void setUp() {
3434
MultiEnvFactory.createEnv(2);
3535
env = MultiEnvFactory.getEnv(0);
36-
env.getConfig().getCommonConfig().setAutoCreateSchemaEnabled(true);
37-
// 10 min, assert that the operations will not time out
38-
env.getConfig().getCommonConfig().setDnConnectionTimeoutMs(600000);
39-
env.getConfig().getCommonConfig().setIsPipeEnableMemoryCheck(false);
36+
env.getConfig()
37+
.getCommonConfig()
38+
.setAutoCreateSchemaEnabled(true)
39+
.setPipeMemoryManagementEnabled(false)
40+
.setIsPipeEnableMemoryCheck(false);
4041
env.initClusterEnvironment();
4142
}
4243

integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/AbstractSubscriptionDualIT.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,16 @@ protected void setUpConfig() {
6060
senderEnv.getConfig().getCommonConfig().setDnConnectionTimeoutMs(600000);
6161
receiverEnv.getConfig().getCommonConfig().setDnConnectionTimeoutMs(600000);
6262

63-
senderEnv.getConfig().getCommonConfig().setIsPipeEnableMemoryCheck(false);
64-
receiverEnv.getConfig().getCommonConfig().setIsPipeEnableMemoryCheck(false);
63+
senderEnv
64+
.getConfig()
65+
.getCommonConfig()
66+
.setPipeMemoryManagementEnabled(false)
67+
.setIsPipeEnableMemoryCheck(false);
68+
receiverEnv
69+
.getConfig()
70+
.getCommonConfig()
71+
.setPipeMemoryManagementEnabled(false)
72+
.setIsPipeEnableMemoryCheck(false);
6573
}
6674

6775
@Override

integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/tablemodel/IoTDBSubscriptionTopicIT.java

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,18 @@ protected void setUpConfig() {
8181
.getConfig()
8282
.getCommonConfig()
8383
.setPipeHeartbeatIntervalSecondsForCollectingPipeMeta(30);
84-
senderEnv.getConfig().getCommonConfig().setPipeMetaSyncerInitialSyncDelayMinutes(1);
85-
senderEnv.getConfig().getCommonConfig().setPipeMetaSyncerSyncIntervalMinutes(1);
84+
senderEnv
85+
.getConfig()
86+
.getCommonConfig()
87+
.setPipeMetaSyncerInitialSyncDelayMinutes(1)
88+
.setPipeMemoryManagementEnabled(false)
89+
.setIsPipeEnableMemoryCheck(false);
90+
senderEnv
91+
.getConfig()
92+
.getCommonConfig()
93+
.setPipeMetaSyncerSyncIntervalMinutes(1)
94+
.setPipeMemoryManagementEnabled(false)
95+
.setIsPipeEnableMemoryCheck(false);
8696
}
8797

8898
@Test

integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/treemodel/IoTDBSubscriptionConsumerGroupIT.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,19 @@ static final class SubscriptionInfo {
118118
protected void setUpConfig() {
119119
super.setUpConfig();
120120

121-
senderEnv.getConfig().getCommonConfig().setIsPipeEnableMemoryCheck(false);
121+
senderEnv
122+
.getConfig()
123+
.getCommonConfig()
124+
.setPipeMemoryManagementEnabled(false)
125+
.setIsPipeEnableMemoryCheck(false);
122126

123127
// Enable air gap receiver
124128
receiverEnv.getConfig().getCommonConfig().setPipeAirGapReceiverEnabled(true);
125-
receiverEnv.getConfig().getCommonConfig().setIsPipeEnableMemoryCheck(false);
129+
receiverEnv
130+
.getConfig()
131+
.getCommonConfig()
132+
.setPipeMemoryManagementEnabled(false)
133+
.setIsPipeEnableMemoryCheck(false);
126134
}
127135

128136
@Override

integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/treemodel/IoTDBSubscriptionTimePrecisionIT.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,17 @@ protected void setUpConfig() {
6969

7070
// Set timestamp precision to nanosecond
7171
senderEnv.getConfig().getCommonConfig().setTimestampPrecision("ns");
72-
senderEnv.getConfig().getCommonConfig().setIsPipeEnableMemoryCheck(false);
72+
senderEnv
73+
.getConfig()
74+
.getCommonConfig()
75+
.setPipeMemoryManagementEnabled(false)
76+
.setIsPipeEnableMemoryCheck(false);
7377
receiverEnv.getConfig().getCommonConfig().setTimestampPrecision("ns");
74-
receiverEnv.getConfig().getCommonConfig().setIsPipeEnableMemoryCheck(false);
78+
receiverEnv
79+
.getConfig()
80+
.getCommonConfig()
81+
.setPipeMemoryManagementEnabled(false)
82+
.setIsPipeEnableMemoryCheck(false);
7583
}
7684

7785
@Test

integration-test/src/test/java/org/apache/iotdb/subscription/it/dual/treemodel/IoTDBSubscriptionTopicIT.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,17 @@ protected void setUpConfig() {
9292
.setPipeHeartbeatIntervalSecondsForCollectingPipeMeta(30);
9393
senderEnv.getConfig().getCommonConfig().setPipeMetaSyncerInitialSyncDelayMinutes(1);
9494
senderEnv.getConfig().getCommonConfig().setPipeMetaSyncerSyncIntervalMinutes(1);
95-
senderEnv.getConfig().getCommonConfig().setIsPipeEnableMemoryCheck(false);
95+
senderEnv
96+
.getConfig()
97+
.getCommonConfig()
98+
.setPipeMemoryManagementEnabled(false)
99+
.setIsPipeEnableMemoryCheck(false);
96100

97-
receiverEnv.getConfig().getCommonConfig().setIsPipeEnableMemoryCheck(false);
101+
receiverEnv
102+
.getConfig()
103+
.getCommonConfig()
104+
.setPipeMemoryManagementEnabled(false)
105+
.setIsPipeEnableMemoryCheck(false);
98106
}
99107

100108
@Test

integration-test/src/test/java/org/apache/iotdb/subscription/it/triple/AbstractSubscriptionTripleIT.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,16 @@ protected void setUpConfig() {
8383
receiver1.getConfig().getConfigNodeConfig().setLeaderDistributionPolicy("HASH");
8484
receiver2.getConfig().getConfigNodeConfig().setLeaderDistributionPolicy("HASH");
8585

86-
receiver1.getConfig().getCommonConfig().setIsPipeEnableMemoryCheck(false);
87-
receiver2.getConfig().getCommonConfig().setIsPipeEnableMemoryCheck(false);
86+
receiver1
87+
.getConfig()
88+
.getCommonConfig()
89+
.setPipeMemoryManagementEnabled(false)
90+
.setIsPipeEnableMemoryCheck(false);
91+
receiver2
92+
.getConfig()
93+
.getCommonConfig()
94+
.setPipeMemoryManagementEnabled(false)
95+
.setIsPipeEnableMemoryCheck(false);
8896
}
8997

9098
@Override

0 commit comments

Comments
 (0)