Skip to content

Commit 21ee53c

Browse files
changxue2022changxue2022
authored
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
1 parent 25c933f commit 21ee53c

3 files changed

Lines changed: 5 additions & 2 deletions

File tree

‎docker/src/main/DockerCompose/docker-compose-cluster-1c2d.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ services:
2727
- cn_internal_port=10710
2828
- cn_consensus_port=10720
2929
- cn_seed_config_node=iotdb-confignode:10710
30+
- CONFIGNODE_JMX_OPTS=-Xms1G -Xmx1G -XX:MaxDirectMemorySize=256M
3031
volumes:
3132
- ./data/confignode:/iotdb/data
3233
- ./logs/confignode:/iotdb/logs
@@ -48,6 +49,7 @@ services:
4849
- dn_mpp_data_exchange_port=10740
4950
- dn_schema_region_consensus_port=10750
5051
- dn_data_region_consensus_port=10760
52+
- IOTDB_JMX_OPTS=-Xms4G -Xmx4G -XX:MaxDirectMemorySize=1G
5153
volumes:
5254
- ./data/datanode1:/iotdb/data/
5355
- ./logs/datanode1:/iotdb/logs/
@@ -67,6 +69,7 @@ services:
6769
- dn_mpp_data_exchange_port=10740
6870
- dn_schema_region_consensus_port=10750
6971
- dn_data_region_consensus_port=10760
72+
- IOTDB_JMX_OPTS=-Xms4G -Xmx4G -XX:MaxDirectMemorySize=1G
7073
volumes:
7174
- ./data/datanode2:/iotdb/data/
7275
- ./logs/datanode2:/iotdb/logs/

‎docker/src/main/DockerCompose/docker-compose-standalone.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ services:
3838
- dn_seed_config_node=iotdb-service:10710
3939
- IOTDB_JMX_OPTS=-Xms4G -Xmx4G -XX:MaxDirectMemorySize=1G
4040
- CONFIGNODE_JMX_OPTS=-Xms1G -Xmx1G -XX:MaxDirectMemorySize=256M
41-
volumes:
41+
volumes:
4242
- ./data:/iotdb/data
4343
- ./logs:/iotdb/logs
4444
networks:

‎scripts/conf/datanode-env.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ calculate_memory_sizes
268268
# off heap memory size
269269
#OFF_HEAP_MEMORY="512M"
270270

271-
# configure JVM memory with set environment variable of IOTDB_JMX_OPTS
271+
# configure JVM memory with setting environment variable of IOTDB_JMX_OPTS
272272
if [[ "$IOTDB_JMX_OPTS" =~ -Xmx ]];then
273273
item_arr=(${IOTDB_JMX_OPTS})
274274
for item in ${item_arr[@]};do

0 commit comments

Comments
 (0)