(iotdb) branch master updated: docker-compose file:fix a slip of the pen and add the new way to set memory with environment variables (#15496)

[haonan]

This is an automated email from the ASF dual-hosted git repository.

haonan 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 21ee53c0f1e docker-compose file:fix a slip of the pen and add the new 
way to set memory with environment variables (#15496)
21ee53c0f1e is described below

commit 21ee53c0f1e0d1750806e6cea6c687cd4c957dbc
Author: changxue2022 <115675618+changxue2...@users.noreply.github.com>
AuthorDate: Wed May 14 09:30:44 2025 +0800

    docker-compose file:fix a slip of the pen and add the new way to set memory 
with environment variables (#15496)
    
    * docker: support configuring JVM memory environment variables in 
docker-compose file:IOTDB_JMX_OPTS for datanode,CONFIGNODE_JMX_OPTS for 
confignode
    
    * recover the place of setting ON_HEAP_MEMORY and OFF_HEAP_MEMORY to fix 
atmos
    
    * docker-compose file:fix a slip of the pen and add the new way to set 
memory with environment variables
---
 docker/src/main/DockerCompose/docker-compose-cluster-1c2d.yml | 3 +++
 docker/src/main/DockerCompose/docker-compose-standalone.yml   | 2 +-
 scripts/conf/datanode-env.sh                                  | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/docker/src/main/DockerCompose/docker-compose-cluster-1c2d.yml 
b/docker/src/main/DockerCompose/docker-compose-cluster-1c2d.yml
index d7fd52ead2f..0cd0f8ac78b 100644
--- a/docker/src/main/DockerCompose/docker-compose-cluster-1c2d.yml
+++ b/docker/src/main/DockerCompose/docker-compose-cluster-1c2d.yml
@@ -27,6 +27,7 @@ services:
       - cn_internal_port=10710
       - cn_consensus_port=10720
       - cn_seed_config_node=iotdb-confignode:10710
+      - CONFIGNODE_JMX_OPTS=-Xms1G -Xmx1G -XX:MaxDirectMemorySize=256M
     volumes:
         - ./data/confignode:/iotdb/data
         - ./logs/confignode:/iotdb/logs
@@ -48,6 +49,7 @@ services:
       - dn_mpp_data_exchange_port=10740
       - dn_schema_region_consensus_port=10750
       - dn_data_region_consensus_port=10760
+      - IOTDB_JMX_OPTS=-Xms4G -Xmx4G -XX:MaxDirectMemorySize=1G
     volumes:
       - ./data/datanode1:/iotdb/data/
       - ./logs/datanode1:/iotdb/logs/
@@ -67,6 +69,7 @@ services:
       - dn_mpp_data_exchange_port=10740
       - dn_schema_region_consensus_port=10750
       - dn_data_region_consensus_port=10760
+      - IOTDB_JMX_OPTS=-Xms4G -Xmx4G -XX:MaxDirectMemorySize=1G
     volumes:
       - ./data/datanode2:/iotdb/data/
       - ./logs/datanode2:/iotdb/logs/
diff --git a/docker/src/main/DockerCompose/docker-compose-standalone.yml 
b/docker/src/main/DockerCompose/docker-compose-standalone.yml
index e3c4a19b6be..1c8edd94eca 100644
--- a/docker/src/main/DockerCompose/docker-compose-standalone.yml
+++ b/docker/src/main/DockerCompose/docker-compose-standalone.yml
@@ -38,7 +38,7 @@ services:
       - dn_seed_config_node=iotdb-service:10710
       - IOTDB_JMX_OPTS=-Xms4G -Xmx4G -XX:MaxDirectMemorySize=1G
       - CONFIGNODE_JMX_OPTS=-Xms1G -Xmx1G -XX:MaxDirectMemorySize=256M
-     volumes:
+    volumes:
         - ./data:/iotdb/data
         - ./logs:/iotdb/logs
     networks:
diff --git a/scripts/conf/datanode-env.sh b/scripts/conf/datanode-env.sh
index be64cce712b..7adcd21923b 100755
--- a/scripts/conf/datanode-env.sh
+++ b/scripts/conf/datanode-env.sh
@@ -268,7 +268,7 @@ calculate_memory_sizes
 # off heap memory size
 #OFF_HEAP_MEMORY="512M"
 
-# configure JVM memory with set environment variable of IOTDB_JMX_OPTS
+# configure JVM memory with setting environment variable of IOTDB_JMX_OPTS
 if [[ "$IOTDB_JMX_OPTS" =~ -Xmx ]];then
     item_arr=(${IOTDB_JMX_OPTS})
     for item in ${item_arr[@]};do