You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ro...@apache.org on 2023/10/31 02:44:35 UTC
(iotdb) branch master updated: [IOTDB-6218] Rename storage_query_schema_consensus_free_memory_proportion to datanode_memory_proportion (#11408)
This is an automated email from the ASF dual-hosted git repository.
rong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 4040bfccce4 [IOTDB-6218] Rename storage_query_schema_consensus_free_memory_proportion to datanode_memory_proportion (#11408)
4040bfccce4 is described below
commit 4040bfccce4fc4530b317f23c3536755099ed19c
Author: Yongzao <yo...@apache.org>
AuthorDate: Tue Oct 31 10:44:29 2023 +0800
[IOTDB-6218] Rename storage_query_schema_consensus_free_memory_proportion to datanode_memory_proportion (#11408)
---
.../java/org/apache/iotdb/db/conf/IoTDBDescriptor.java | 15 +++++++++++++--
.../src/assembly/resources/conf/iotdb-common.properties | 8 ++++----
2 files changed, 17 insertions(+), 6 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 9ee180e0a16..5764e23c979 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
@@ -1690,8 +1690,17 @@ public class IoTDBDescriptor {
}
private void initMemoryAllocate(Properties properties) {
- String memoryAllocateProportion =
- properties.getProperty("storage_query_schema_consensus_free_memory_proportion");
+ String memoryAllocateProportion = properties.getProperty("datanode_memory_proportion", null);
+ if (memoryAllocateProportion == null) {
+ memoryAllocateProportion =
+ properties.getProperty("storage_query_schema_consensus_free_memory_proportion");
+ if (memoryAllocateProportion != null) {
+ logger.warn(
+ "The parameter storage_query_schema_consensus_free_memory_proportion is deprecated since v1.2.3, "
+ + "please use datanode_memory_proportion instead.");
+ }
+ }
+
if (memoryAllocateProportion != null) {
String[] proportions = memoryAllocateProportion.split(":");
int proportionSum = 0;
@@ -1712,6 +1721,8 @@ public class IoTDBDescriptor {
if (proportions.length >= 6) {
conf.setAllocateMemoryForPipe(
maxMemoryAvailable * Integer.parseInt(proportions[4].trim()) / proportionSum);
+ } else {
+ conf.setAllocateMemoryForPipe(0);
}
}
}
diff --git a/iotdb-core/node-commons/src/assembly/resources/conf/iotdb-common.properties b/iotdb-core/node-commons/src/assembly/resources/conf/iotdb-common.properties
index cb10c55e781..c6b996c6391 100644
--- a/iotdb-core/node-commons/src/assembly/resources/conf/iotdb-common.properties
+++ b/iotdb-core/node-commons/src/assembly/resources/conf/iotdb-common.properties
@@ -172,10 +172,10 @@ cluster_name=defaultCluster
# Datatype: boolean
# enable_mem_control=true
-# Memory Allocation Ratio: StorageEngine, QueryEngine, SchemaEngine, Consensus and Free Memory.
-# The parameter form is a:b:c:d:e, where a, b, c, d and e are integers. for example: 1:1:1:1:1 , 6:2:1:1:1
-# If you have high level of writing pressure and low level of reading pressure, please adjust it to for example 6:1:1:1:2
-# storage_query_schema_consensus_free_memory_proportion=3:3:1:1:2
+# Memory Allocation Ratio: StorageEngine, QueryEngine, SchemaEngine, StreamingEngine, Consensus and Free Memory.
+# The parameter form is a:b:c:d:e:f, where a, b, c, d, e and f are integers. for example: 1:1:1:1:1:1 , 6:2:1:1:1:1
+# If you have high level of writing pressure and low level of reading pressure, please adjust it to for example 6:1:1:1:1:2
+# datanode_memory_proportion=3:3:1:1:1:1
# Schema Memory Allocation Ratio: SchemaRegion, SchemaCache, and PartitionCache.
# The parameter form is a:b:c, where a, b and c are integers. for example: 1:1:1 , 6:2:1