This is an automated email from the ASF dual-hosted git repository.
zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 8f88d45504d fix https://github.com/apache/shardingsphere/issues/36979
(#36998)
8f88d45504d is described below
commit 8f88d45504dc2cc8a0ed3aff37cbf290cde305b8
Author: knowwen <[email protected]>
AuthorDate: Thu Nov 6 00:31:53 2025 +0800
fix https://github.com/apache/shardingsphere/issues/36979 (#36998)
---
distribution/proxy/src/main/resources/bin/start.sh | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/distribution/proxy/src/main/resources/bin/start.sh
b/distribution/proxy/src/main/resources/bin/start.sh
index dc90e147504..ecc87659d8b 100644
--- a/distribution/proxy/src/main/resources/bin/start.sh
+++ b/distribution/proxy/src/main/resources/bin/start.sh
@@ -84,7 +84,10 @@ fi
CGROUP_MEM_OPTS="${CGROUP_MEM_OPTS:-${DEFAULT_CGROUP_MEM_OPTS}}"
JAVA_OPTS=" -Djava.awt.headless=true "
-
+ # Merge user-defined JVM_OPTS
+if [ -n "${JVM_OPTS}" ]; then
+ JAVA_OPTS="${JAVA_OPTS} ${JVM_OPTS}"
+fi
DEFAULT_JAVA_MEM_COMMON_OPTS=" -Xmx2g -Xms2g -Xmn1g "
if [ -n "${IS_DOCKER}" ]; then
JAVA_MEM_COMMON_OPTS="${CGROUP_MEM_OPTS}"
