Solve #1606, Make JVM parameter configurable (#1609)

Intel-bigdata · Mar 2, 2018 · e8aeb5b · e8aeb5b
1 parent 95e1445
commit e8aeb5b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/bin/common.sh b/bin/common.sh
@@ -283,12 +283,14 @@ function init_command() {
       ALLOW_DAEMON_OPT=true
       SMART_VARGS+=" -format"
       JAVA_OPTS+=" -Dsmart.log.file="${SMART_LOG_FILE_NAME}
+      JAVA_OPST+=" ${SSM_JAVA_OPT} ${SSM_SERVER_JAVA_OPT}"
     ;;
     smartserver)
       SMART_CLASSNAME=org.smartdata.server.SmartDaemon
       SMART_PID_FILE=/tmp/SmartServer.pid
       ALLOW_DAEMON_OPT=true
       JAVA_OPTS+=" -Dsmart.log.file="${SMART_LOG_FILE_NAME}
+      JAVA_OPST+=" ${SSM_JAVA_OPT} ${SSM_SERVER_JAVA_OPT}"
       SMART_VARGS+=" -D smart.agent.master.address="${SSM_EXEC_HOST}
       reorder_lib
     ;;
@@ -299,6 +301,7 @@ function init_command() {
       export SMART_LOG_FILE_NAME=${SMART_AGENT_LOG_FILE_NAME}
       export SMART_LOG_FILE=${SMART_LOG_DIR}/${SMART_LOG_FILE_NAME}
       JAVA_OPTS+=" -Dsmart.log.file="${SMART_LOG_FILE_NAME}
+      JAVA_OPST+=" ${SSM_JAVA_OPT} ${SSM_AGENT_JAVA_OPT}"
       SMART_VARGS+=" -D smart.agent.address="${SSM_EXEC_HOST}
     ;;
     getconf)

diff --git a/conf/smart-env.sh b/conf/smart-env.sh
@@ -19,3 +19,13 @@
 # when starting a distributed SSM cluster. Or in some cases, it may leads to some
 # error (cases reported on Ubuntu OS).
 #export JAVA_HOME=
+
+
+# Options used to start SSM Server JVM
+#export SSM_SERVER_JAVA_OPT=
+
+# Options used to start SSM Agent JVM
+#export SSM_AGENT_JAVA_OPT=
+
+# Common options used to start JVM both for SSM Server and Agent
+#export SSM_JAVA_OPT=