Skip to content

docker-compose file:fix a slip of the pen and add the new way to set memory with environment variables #15496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HTHou merged 5 commits into from
May 14, 2025
Merged

docker-compose file:fix a slip of the pen and add the new way to set memory with environment variables #15496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fc20cb2
docker: support configuring JVM memory environment variables in docke…
changxue2022 Apr 25, 2025
9e15061
Merge branch 'master' of https://github.com/changxue2022/iotdb
changxue2022 Apr 27, 2025
de34e85
recover the place of setting ON_HEAP_MEMORY and OFF_HEAP_MEMORY to fi…
changxue2022 Apr 27, 2025
f3dbf5e
Merge branch 'master' of https://github.com/changxue2022/iotdb
changxue2022 May 13, 2025
703c52d
docker-compose file:fix a slip of the pen and add the new way to set …
changxue2022 May 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions docker/src/main/DockerCompose/docker-compose-cluster-1c2d.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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/
Expand All @@ -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/
Expand Down
2 changes: 1 addition & 1 deletion docker/src/main/DockerCompose/docker-compose-standalone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion scripts/conf/datanode-env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading