Skip to content

Commit bec0409

Browse files
authored
Pipe: Changed the default batch memory request size to avoid CI failure (#15690)
* Fix * Update PipeConsensusTransferBatchReqBuilder.java * Update IoTDBConfig.java * Update PipeConnectorConstant.java * Update PipeConnectorConstant.java * Fix * Update IoTDBConfig.java
1 parent b5b7b70 commit bec0409

4 files changed

Lines changed: 8 additions & 9 deletions

File tree

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public class IoTDBConfig {
151151

152152
private long allocateMemoryForRead = Runtime.getRuntime().maxMemory() * 3 / 10;
153153

154-
private long allocateMemoryPerWalCache = 2 * 1024 * 1024;
154+
private long allocateMemoryPerWalCache = 512 * 1024;
155155

156156
/** Flush proportion for system */
157157
private double flushProportion = 0.4;

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/connector/protocol/pipeconsensus/payload/builder/PipeConsensusTransferBatchReqBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_IOTDB_BATCH_DELAY_MS_KEY;
5050
import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_IOTDB_BATCH_DELAY_SECONDS_KEY;
5151
import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_IOTDB_BATCH_SIZE_KEY;
52-
import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_IOTDB_CONSENSUS_BATCH_SIZE_DEFAULT_VALUE;
5352
import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_IOTDB_PLAIN_BATCH_DELAY_DEFAULT_VALUE;
53+
import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.CONNECTOR_IOTDB_PLAIN_BATCH_SIZE_DEFAULT_VALUE;
5454
import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.SINK_IOTDB_BATCH_DELAY_MS_KEY;
5555
import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.SINK_IOTDB_BATCH_DELAY_SECONDS_KEY;
5656
import static org.apache.iotdb.commons.pipe.config.constant.PipeConnectorConstant.SINK_IOTDB_BATCH_SIZE_KEY;
@@ -95,7 +95,7 @@ protected PipeConsensusTransferBatchReqBuilder(
9595
final long requestMaxBatchSizeInBytes =
9696
parameters.getLongOrDefault(
9797
Arrays.asList(CONNECTOR_IOTDB_BATCH_SIZE_KEY, SINK_IOTDB_BATCH_SIZE_KEY),
98-
CONNECTOR_IOTDB_CONSENSUS_BATCH_SIZE_DEFAULT_VALUE);
98+
CONNECTOR_IOTDB_PLAIN_BATCH_SIZE_DEFAULT_VALUE);
9999

100100
allocatedMemoryBlock =
101101
PipeDataNodeResourceManager.memory()

iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -330,10 +330,10 @@ public class CommonConfig {
330330
private float subscriptionCacheMemoryUsagePercentage = 0.2F;
331331
private int subscriptionSubtaskExecutorMaxThreadNum = 2;
332332

333-
private int subscriptionPrefetchTabletBatchMaxDelayInMs = 1000; // 1s
334-
private long subscriptionPrefetchTabletBatchMaxSizeInBytes = 16 * MB;
335-
private int subscriptionPrefetchTsFileBatchMaxDelayInMs = 5000; // 5s
336-
private long subscriptionPrefetchTsFileBatchMaxSizeInBytes = 80 * MB;
333+
private int subscriptionPrefetchTabletBatchMaxDelayInMs = 20; // 1s
334+
private long subscriptionPrefetchTabletBatchMaxSizeInBytes = MB;
335+
private int subscriptionPrefetchTsFileBatchMaxDelayInMs = 1000; // 5s
336+
private long subscriptionPrefetchTsFileBatchMaxSizeInBytes = 2 * MB;
337337
private int subscriptionPollMaxBlockingTimeMs = 500;
338338
private int subscriptionDefaultTimeoutInMs = 10_000; // 10s
339339
private long subscriptionLaunchRetryIntervalMs = 1000;

iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/pipe/config/constant/PipeConnectorConstant.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,7 @@ public class PipeConnectorConstant {
7676
public static final String CONNECTOR_IOTDB_BATCH_SIZE_KEY = "connector.batch.size-bytes";
7777
public static final String SINK_IOTDB_BATCH_SIZE_KEY = "sink.batch.size-bytes";
7878
public static final long CONNECTOR_IOTDB_PLAIN_BATCH_SIZE_DEFAULT_VALUE = MB;
79-
public static final long CONNECTOR_IOTDB_CONSENSUS_BATCH_SIZE_DEFAULT_VALUE = 16 * MB;
80-
public static final long CONNECTOR_IOTDB_TS_FILE_BATCH_SIZE_DEFAULT_VALUE = 80 * MB;
79+
public static final long CONNECTOR_IOTDB_TS_FILE_BATCH_SIZE_DEFAULT_VALUE = 2 * MB;
8180

8281
public static final String CONNECTOR_IOTDB_USER_KEY = "connector.user";
8382
public static final String SINK_IOTDB_USER_KEY = "sink.user";

0 commit comments

Comments
 (0)