This is an automated email from the ASF dual-hosted git repository. xingtanzjr pushed a commit to branch multi_dir_change_to_seq in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 805979f100d8c1888a6de912d9e87a9e7e069026 Author: Jinrui.Zhang <[email protected]> AuthorDate: Fri Apr 21 17:54:49 2023 +0800 change multi_dir default strategy to SequenceStrategy --- server/src/assembly/resources/conf/iotdb-datanode.properties | 2 +- server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java | 2 +- .../org/apache/iotdb/db/conf/directories/strategy/SequenceStrategy.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/src/assembly/resources/conf/iotdb-datanode.properties b/server/src/assembly/resources/conf/iotdb-datanode.properties index e23b7dfcb1..e0e1c4b2c5 100644 --- a/server/src/assembly/resources/conf/iotdb-datanode.properties +++ b/server/src/assembly/resources/conf/iotdb-datanode.properties @@ -165,7 +165,7 @@ dn_target_config_node_list=127.0.0.1:10710 # Set SequenceStrategy,MaxDiskUsableSpaceFirstStrategy and MinFolderOccupiedSpaceFirstStrategy to apply the corresponding strategy. # If this property is unset, system will use MaxDiskUsableSpaceFirstStrategy as default strategy. # For this property, fully-qualified class name (include package name) and simple class name are both acceptable. -# dn_multi_dir_strategy=MaxDiskUsableSpaceFirstStrategy +# dn_multi_dir_strategy=SequenceStrategy # consensus dir # If this property is unset, system will save the data in the default relative path directory under the IoTDB folder(i.e., %IOTDB_HOME%/data/datanode). 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 1ceb377605..f90c84650c 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 @@ -71,7 +71,7 @@ public class IoTDBConfig { private static final Logger logger = LoggerFactory.getLogger(IoTDBConfig.class); private static final String MULTI_DIR_STRATEGY_PREFIX = "org.apache.iotdb.db.conf.directories.strategy."; - private static final String DEFAULT_MULTI_DIR_STRATEGY = "MaxDiskUsableSpaceFirstStrategy"; + private static final String DEFAULT_MULTI_DIR_STRATEGY = "SequenceStrategy"; private static final String STORAGE_GROUP_MATCHER = "([a-zA-Z0-9`_.\\-\\u2E80-\\u9FFF]+)"; public static final Pattern STORAGE_GROUP_PATTERN = Pattern.compile(STORAGE_GROUP_MATCHER); diff --git a/server/src/main/java/org/apache/iotdb/db/conf/directories/strategy/SequenceStrategy.java b/server/src/main/java/org/apache/iotdb/db/conf/directories/strategy/SequenceStrategy.java index 2160e8fcb5..4d305fd7b1 100644 --- a/server/src/main/java/org/apache/iotdb/db/conf/directories/strategy/SequenceStrategy.java +++ b/server/src/main/java/org/apache/iotdb/db/conf/directories/strategy/SequenceStrategy.java @@ -53,10 +53,10 @@ public class SequenceStrategy extends DirectoryStrategy { private int tryGetNextIndex(int start) throws DiskSpaceInsufficientException { int index = (start + 1) % folders.size(); while (!JVMCommonUtils.hasSpace(folders.get(index))) { - index = (index + 1) % folders.size(); if (index == start) { throw new DiskSpaceInsufficientException(folders); } + index = (index + 1) % folders.size(); } return index; }
