From 095815220df582a04f09f8b645f9f01128168bf9 Mon Sep 17 00:00:00 2001 From: Siyao Meng Date: Mon, 6 May 2019 15:47:00 -0700 Subject: [PATCH] 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 (cherry picked from commit 93f2283a69ea4e07a998f2a4065f238f9574921b) --- .../hadoop-common/src/main/bin/hadoop-functions.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh b/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh index f0daafd47ea..b3b8afcc79d 100755 --- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop-functions.sh +++ b/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 JSVC_HOME: ${JSVC_HOME}" hadoop_debug "jsvc: ${jsvc}" + hadoop_debug "Final HADOOP_DAEMON_JSVC_EXTRA_OPTS: ${HADOOP_DAEMON_JSVC_EXTRA_OPTS}" hadoop_debug "Class name: ${class}" hadoop_debug "Command line options: $*" @@ -1936,6 +1937,7 @@ function hadoop_start_secure_daemon # shellcheck disable=SC2086 exec "${jsvc}" \ "-Dproc_${daemonname}" \ + ${HADOOP_DAEMON_JSVC_EXTRA_OPTS} \ -outfile "${daemonoutfile}" \ -errfile "${daemonerrfile}" \ -pidfile "${daemonpidfile}" \