Browse Source

HADOOP-16289. Allow extra jsvc startup option in hadoop_start_secure_daemon in hadoop-functions.sh. Contributed by Siyao Meng.

Signed-off-by: Wei-Chiu Chuang <weichiu@apache.org>
(cherry picked from commit 93f2283a69ea4e07a998f2a4065f238f9574921b)
Siyao Meng 6 years ago
parent
commit
095815220d

+ 2 - 0
hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh

@@ -1924,6 +1924,7 @@ function hadoop_start_secure_daemon
   hadoop_debug "Final HADOOP_OPTS: ${HADOOP_OPTS}"
   hadoop_debug "Final HADOOP_OPTS: ${HADOOP_OPTS}"
   hadoop_debug "Final JSVC_HOME: ${JSVC_HOME}"
   hadoop_debug "Final JSVC_HOME: ${JSVC_HOME}"
   hadoop_debug "jsvc: ${jsvc}"
   hadoop_debug "jsvc: ${jsvc}"
+  hadoop_debug "Final HADOOP_DAEMON_JSVC_EXTRA_OPTS: ${HADOOP_DAEMON_JSVC_EXTRA_OPTS}"
   hadoop_debug "Class name: ${class}"
   hadoop_debug "Class name: ${class}"
   hadoop_debug "Command line options: $*"
   hadoop_debug "Command line options: $*"
 
 
@@ -1936,6 +1937,7 @@ function hadoop_start_secure_daemon
   # shellcheck disable=SC2086
   # shellcheck disable=SC2086
   exec "${jsvc}" \
   exec "${jsvc}" \
     "-Dproc_${daemonname}" \
     "-Dproc_${daemonname}" \
+    ${HADOOP_DAEMON_JSVC_EXTRA_OPTS} \
     -outfile "${daemonoutfile}" \
     -outfile "${daemonoutfile}" \
     -errfile "${daemonerrfile}" \
     -errfile "${daemonerrfile}" \
     -pidfile "${daemonpidfile}" \
     -pidfile "${daemonpidfile}" \