This is an automated email from the ASF dual-hosted git repository. haonan pushed a commit to branch rc/1.2.2 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 5d4c2e57e53d890333e16aa0e2e09c2c0f189fab Author: HTHou <[email protected]> AuthorDate: Tue Sep 26 19:21:48 2023 +0800 Revert "[To rel/1.2] add hot load compaction configs (#10759)" This reverts commit 720ad0d5b8f08bc740f97ed981382072570ac794. --- .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 92 ---------------------- .../compaction/schedule/CompactionTaskManager.java | 1 + 2 files changed, 1 insertion(+), 92 deletions(-) diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java index 4e082a76635..dd4c0ab39f5 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java @@ -35,7 +35,6 @@ import org.apache.iotdb.db.storageengine.dataregion.compaction.constant.Compacti import org.apache.iotdb.db.storageengine.dataregion.compaction.execute.performer.constant.CrossCompactionPerformer; import org.apache.iotdb.db.storageengine.dataregion.compaction.execute.performer.constant.InnerSeqCompactionPerformer; import org.apache.iotdb.db.storageengine.dataregion.compaction.execute.performer.constant.InnerUnseqCompactionPerformer; -import org.apache.iotdb.db.storageengine.dataregion.compaction.schedule.CompactionTaskManager; import org.apache.iotdb.db.storageengine.dataregion.compaction.schedule.constant.CompactionPriority; import org.apache.iotdb.db.storageengine.dataregion.compaction.selector.constant.CrossCompactionSelector; import org.apache.iotdb.db.storageengine.dataregion.compaction.selector.constant.InnerSequenceCompactionSelector; @@ -1102,94 +1101,6 @@ public class IoTDBDescriptor { loadWALHotModifiedProps(properties); } - private void loadCompactionHotModifiedProps(Properties properties) throws InterruptedException { - conf.setCompactionValidationLevel( - CompactionValidationLevel.valueOf( - properties.getProperty( - "compaction_validation_level", conf.getCompactionValidationLevel().toString()))); - - loadCompactionIsEnabledHotModifiedProps(properties); - - boolean restartCompactionTaskManager = loadCompactionThreadCountHotModifiedProps(properties); - - restartCompactionTaskManager |= loadCompactionSubTaskCountHotModifiedProps(properties); - - if (restartCompactionTaskManager) { - CompactionTaskManager.getInstance().restart(); - } - } - - private boolean loadCompactionThreadCountHotModifiedProps(Properties properties) { - int newConfigCompactionThreadCount = - Integer.parseInt( - properties.getProperty( - "compaction_thread_count", Integer.toString(conf.getCompactionThreadCount()))); - if (newConfigCompactionThreadCount <= 0) { - logger.error("compaction_thread_count must greater than 0"); - return false; - } - if (newConfigCompactionThreadCount == conf.getCompactionThreadCount()) { - return false; - } - conf.setCompactionThreadCount( - Integer.parseInt( - properties.getProperty( - "compaction_thread_count", Integer.toString(conf.getCompactionThreadCount())))); - return true; - } - - private boolean loadCompactionSubTaskCountHotModifiedProps(Properties properties) { - int newConfigSubtaskNum = - Integer.parseInt( - properties.getProperty( - "sub_compaction_thread_count", Integer.toString(conf.getSubCompactionTaskNum()))); - if (newConfigSubtaskNum <= 0) { - logger.error("sub_compaction_thread_count must greater than 0"); - return false; - } - if (newConfigSubtaskNum == conf.getSubCompactionTaskNum()) { - return false; - } - conf.setSubCompactionTaskNum(newConfigSubtaskNum); - return true; - } - - private void loadCompactionIsEnabledHotModifiedProps(Properties properties) { - boolean isCompactionEnabled = - conf.isEnableSeqSpaceCompaction() - || conf.isEnableUnseqSpaceCompaction() - || conf.isEnableCrossSpaceCompaction(); - - boolean newConfigEnableCrossSpaceCompaction = - Boolean.parseBoolean( - properties.getProperty( - "enable_cross_space_compaction", - Boolean.toString(conf.isEnableCrossSpaceCompaction()))); - boolean newConfigEnableSeqSpaceCompaction = - Boolean.parseBoolean( - properties.getProperty( - "enable_seq_space_compaction", - Boolean.toString(conf.isEnableSeqSpaceCompaction()))); - boolean newConfigEnableUnseqSpaceCompaction = - Boolean.parseBoolean( - properties.getProperty( - "enable_unseq_space_compaction", - Boolean.toString(conf.isEnableUnseqSpaceCompaction()))); - boolean compactionEnabledInNewConfig = - newConfigEnableCrossSpaceCompaction - || newConfigEnableSeqSpaceCompaction - || newConfigEnableUnseqSpaceCompaction; - - if (!isCompactionEnabled && compactionEnabledInNewConfig) { - logger.error("Compaction cannot start in current status."); - return; - } - - conf.setEnableCrossSpaceCompaction(newConfigEnableCrossSpaceCompaction); - conf.setEnableSeqSpaceCompaction(newConfigEnableSeqSpaceCompaction); - conf.setEnableUnseqSpaceCompaction(newConfigEnableUnseqSpaceCompaction); - } - private void loadWALHotModifiedProps(Properties properties) { long walAsyncModeFsyncDelayInMs = Long.parseLong( @@ -1607,9 +1518,6 @@ public class IoTDBDescriptor { WALManager.getInstance().rebootWALDeleteThread(); } - // update compaction config - loadCompactionHotModifiedProps(properties); - // update schema quota configuration conf.setClusterSchemaLimitLevel( properties diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/schedule/CompactionTaskManager.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/schedule/CompactionTaskManager.java index 74f3a99f483..6f8e561a3f9 100644 --- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/schedule/CompactionTaskManager.java +++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/compaction/schedule/CompactionTaskManager.java @@ -398,6 +398,7 @@ public class CompactionTaskManager implements IService { return storageGroupName + "-" + dataRegionId; } + @TestOnly public void restart() throws InterruptedException { if (IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount() > 0) { if (subCompactionTaskExecutionPool != null) {
