This is an automated email from the ASF dual-hosted git repository. xingtanzjr pushed a commit to branch test_write_oom_0905 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 480d1c73513fc0be60f86da29d4b418453f8cd1a Author: Jinrui.Zhang <[email protected]> AuthorDate: Mon Sep 5 20:34:37 2022 +0800 Revert "[IOTDB-4298] Fix schema memory allocate for cluster (#7199)" This reverts commit 83a464173823352ea89485941e1c95f009e19fbc. --- .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 14 ------- .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 43 +++------------------- .../java/org/apache/iotdb/db/service/DataNode.java | 1 - 3 files changed, 6 insertions(+), 52 deletions(-) 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 0b03d48010..82a6c3e3f9 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 @@ -963,12 +963,6 @@ public class IoTDBConfig { /** ThreadPool size for write operation in coordinator */ private int coordinatorWriteExecutorSize = 50; - /** - * Whether the schema memory allocation is default config. Used for cluster mode initialization - * judgement - */ - private boolean isDefaultSchemaMemoryConfig = true; - /** Memory allocated for schemaRegion */ private long allocateMemoryForSchemaRegion = allocateMemoryForSchema * 8 / 10; @@ -3060,14 +3054,6 @@ public class IoTDBConfig { return new TEndPoint(rpcAddress, rpcPort); } - boolean isDefaultSchemaMemoryConfig() { - return isDefaultSchemaMemoryConfig; - } - - void setDefaultSchemaMemoryConfig(boolean defaultSchemaMemoryConfig) { - isDefaultSchemaMemoryConfig = defaultSchemaMemoryConfig; - } - public long getAllocateMemoryForSchemaRegion() { return allocateMemoryForSchemaRegion; } 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 ac3e7d55df..6e8bd435c1 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 @@ -1629,10 +1629,15 @@ public class IoTDBDescriptor { int partitionCacheProportion = 0; int lastCacheProportion = 1; + if (conf.isClusterMode()) { + schemaRegionProportion = 5; + schemaCacheProportion = 3; + partitionCacheProportion = 1; + } + String schemaMemoryAllocatePortion = properties.getProperty("schema_memory_allocate_proportion"); if (schemaMemoryAllocatePortion != null) { - conf.setDefaultSchemaMemoryConfig(false); String[] proportions = schemaMemoryAllocatePortion.split(":"); int loadedProportionSum = 0; for (String proportion : proportions) { @@ -1646,8 +1651,6 @@ public class IoTDBDescriptor { partitionCacheProportion = Integer.parseInt(proportions[2].trim()); lastCacheProportion = Integer.parseInt(proportions[3].trim()); } - } else { - conf.setDefaultSchemaMemoryConfig(true); } conf.setAllocateMemoryForSchemaRegion( @@ -1876,40 +1879,6 @@ public class IoTDBDescriptor { conf.setReadConsistencyLevel(globalConfig.getReadConsistencyLevel()); } - public void initClusterSchemaMemoryAllocate() { - if (!conf.isDefaultSchemaMemoryConfig()) { - // the config has already been updated as user config in properties file - return; - } - - // process the default schema memory allocate - - long schemaMemoryTotal = conf.getAllocateMemoryForSchema(); - - int proportionSum = 10; - int schemaRegionProportion = 5; - int schemaCacheProportion = 3; - int partitionCacheProportion = 1; - int lastCacheProportion = 1; - - conf.setAllocateMemoryForSchemaRegion( - schemaMemoryTotal * schemaRegionProportion / proportionSum); - logger.info( - "Cluster allocateMemoryForSchemaRegion = {}", conf.getAllocateMemoryForSchemaRegion()); - - conf.setAllocateMemoryForSchemaCache(schemaMemoryTotal * schemaCacheProportion / proportionSum); - logger.info( - "Cluster allocateMemoryForSchemaCache = {}", conf.getAllocateMemoryForSchemaCache()); - - conf.setAllocateMemoryForPartitionCache( - schemaMemoryTotal * partitionCacheProportion / proportionSum); - logger.info( - "Cluster allocateMemoryForPartitionCache = {}", conf.getAllocateMemoryForPartitionCache()); - - conf.setAllocateMemoryForLastCache(schemaMemoryTotal * lastCacheProportion / proportionSum); - logger.info("Cluster allocateMemoryForLastCache = {}", conf.getAllocateMemoryForLastCache()); - } - private static class IoTDBDescriptorHolder { private static final IoTDBDescriptor INSTANCE = new IoTDBDescriptor(); diff --git a/server/src/main/java/org/apache/iotdb/db/service/DataNode.java b/server/src/main/java/org/apache/iotdb/db/service/DataNode.java index 5efdbd64f4..16e0287367 100644 --- a/server/src/main/java/org/apache/iotdb/db/service/DataNode.java +++ b/server/src/main/java/org/apache/iotdb/db/service/DataNode.java @@ -190,7 +190,6 @@ public class DataNode implements DataNodeMBean { config.setDataNodeId(dataNodeID); } IoTDBDescriptor.getInstance().loadGlobalConfig(dataNodeRegisterResp.globalConfig); - IoTDBDescriptor.getInstance().initClusterSchemaMemoryAllocate(); if (!IoTDBStartCheck.getInstance() .checkConsensusProtocolExists(TConsensusGroupType.DataRegion)) {
