This is an automated email from the ASF dual-hosted git repository. haonan pushed a commit to branch mc_insert_block_11 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 59085e0b9f97f75d2f0a21dd26be4cee0f5e8266 Author: HTHou <[email protected]> AuthorDate: Thu Dec 3 11:23:33 2020 +0800 change a config name --- server/src/assembly/resources/conf/iotdb-engine.properties | 8 ++++---- .../main/java/org/apache/iotdb/db/conf/IoTDBConfig.java | 14 +++++++------- .../java/org/apache/iotdb/db/conf/IoTDBDescriptor.java | 6 +++--- .../db/engine/storagegroup/StorageGroupProcessor.java | 2 +- .../iotdb/db/engine/storagegroup/TsFileProcessor.java | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/server/src/assembly/resources/conf/iotdb-engine.properties b/server/src/assembly/resources/conf/iotdb-engine.properties index 2079a57..20b9e6a 100644 --- a/server/src/assembly/resources/conf/iotdb-engine.properties +++ b/server/src/assembly/resources/conf/iotdb-engine.properties @@ -245,11 +245,11 @@ storage_group_report_threshold=16777216 # it's just an advised value, the real limitation will be the smaller one between this and the one we calculated max_deduplicated_path_num=1000 -# When an inserting is rejected, waiting time (in ms) to check system again, 0 by default. -waiting_time_when_insert_blocked=0 +# When an inserting is rejected, waiting period (in ms) to check system again, 50 by default. +waiting_period_when_insert_blocked=50 -# When the waiting time (in ms) of an inserting exceeds this, throw an exception. 0 by default. -max_waiting_time_when_insert_blocked=0 +# When the waiting time (in ms) of an inserting exceeds this, throw an exception. 10000 by default. +max_waiting_time_when_insert_blocked=10000 # estimated metadata size (in byte) of one timeseries in Mtree estimated_series_size=300 diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java index 59e1ae2..0fafb1b 100644 --- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java +++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java @@ -162,14 +162,14 @@ public class IoTDBConfig { private long storageGroupSizeReportThreshold = 16 * 1024 * 1024L; /** - * When inserting rejected, waiting this time to check system again + * When inserting rejected, waiting period to check system again */ - private int waitingTimeWhenInsertBlockedInMs = 0; + private int waitingPeriodWhenInsertBlockedInMs = 50; /** * When inserting rejected exceeds this, throw an exception */ - private int maxWaitingTimeWhenInsertBlockedInMs = 0; + private int maxWaitingTimeWhenInsertBlockedInMs = 10000; /** * Is the write ahead log enable. */ @@ -2006,12 +2006,12 @@ public class IoTDBConfig { this.maxQueryDeduplicatedPathNum = maxQueryDeduplicatedPathNum; } - public int getWaitingTimeWhenInsertBlocked() { - return waitingTimeWhenInsertBlockedInMs; + public int getWaitingPeriodWhenInsertBlocked() { + return waitingPeriodWhenInsertBlockedInMs; } - public void setWaitingTimeWhenInsertBlocked(int waitingTimeWhenInsertBlocked) { - this.waitingTimeWhenInsertBlockedInMs = waitingTimeWhenInsertBlocked; + public void setWaitingPeriodWhenInsertBlocked(int waitingPeriodWhenInsertBlocked) { + this.waitingPeriodWhenInsertBlockedInMs = waitingPeriodWhenInsertBlocked; } public int getMaxWaitingTimeWhenInsertBlocked() { diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java index d7a7058..a5b91dc 100644 --- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java +++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java @@ -283,9 +283,9 @@ public class IoTDBDescriptor { .getProperty("avg_series_point_number_threshold", Integer.toString(conf.getAvgSeriesPointNumberThreshold())))); - conf.setWaitingTimeWhenInsertBlocked(Integer.parseInt(properties - .getProperty("waiting_time_when_insert_blocked", - Integer.toString(conf.getWaitingTimeWhenInsertBlocked())))); + conf.setWaitingPeriodWhenInsertBlocked(Integer.parseInt(properties + .getProperty("waiting_period_when_insert_blocked", + Integer.toString(conf.getWaitingPeriodWhenInsertBlocked())))); conf.setMaxWaitingTimeWhenInsertBlocked(Integer.parseInt(properties .getProperty("max_waiting_time_when_insert_blocked", diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java index 9c7d2b5..becd9fd 100755 --- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java +++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java @@ -126,7 +126,7 @@ public class StorageGroupProcessor { private static final Logger DEBUG_LOGGER = LoggerFactory.getLogger("QUERY_DEBUG"); private final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig(); - private final int waitingTimeWhenInsertBlocked = config.getWaitingTimeWhenInsertBlocked(); + private final int waitingTimeWhenInsertBlocked = config.getWaitingPeriodWhenInsertBlocked(); private final int maxWaitingTimeWhenInsertBlocked = config.getMaxWaitingTimeWhenInsertBlocked(); /** * All newly generated chunks after merge have version number 0, so we set merged Modification diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java index 108628d..65cf441 100644 --- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java +++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java @@ -83,7 +83,7 @@ public class TsFileProcessor { private final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig(); private final boolean enableMemControl = config.isEnableMemControl(); - private final int waitingTimeWhenInsertBlocked = config.getWaitingTimeWhenInsertBlocked(); + private final int waitingTimeWhenInsertBlocked = config.getWaitingPeriodWhenInsertBlocked(); private final int maxWaitingTimeWhenInsertBlocked = config.getMaxWaitingTimeWhenInsertBlocked(); private StorageGroupInfo storageGroupInfo; private TsFileProcessorInfo tsFileProcessorInfo;
