Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-14131. kms.sh creates bogus dir for tomcat logs. Contributed by John Zhuge. 

Change-Id: I444e10318eb64dcd4c0416b985d12049c72e8943
This commit is contained in:
John Zhuge 2017-03-01 16:31:34 -08:00
parent ff08f54f41
commit 133857ba04
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-common-project/hadoop-kms/src/main/sbin/kms.sh
View File

@ -59,7 +59,8 @@ CATALINA_OPTS_DISP=`echo ${CATALINA_OPTS} | sed -e 's/trustStorePassword=[^ ]*/t
print "Using CATALINA_OPTS: ${CATALINA_OPTS_DISP}"
catalina_opts="-Dproc_kms"
catalina_opts="${catalina_opts} -Djava.library.path=${JAVA_LIBRARY_PATH}";
catalina_opts="${catalina_opts} -Dkms.log.dir=${KMS_LOG}"
catalina_opts="${catalina_opts} -Djava.library.path=${JAVA_LIBRARY_PATH}"
print "Adding to CATALINA_OPTS: ${catalina_opts}"
print "Found KMS_SSL_KEYSTORE_PASS: `echo ${KMS_SSL_KEYSTORE_PASS} | sed 's/./*/g'`"
@ -84,7 +85,6 @@ if [[ "${1}" = "start" || "${1}" = "run" ]]; then
catalina_init_properties
catalina_set_property "kms.home.dir" "${KMS_HOME}"
catalina_set_property "kms.config.dir" "${KMS_CONFIG}"
catalina_set_property "kms.log.dir" "${KMS_LOG}"
catalina_set_property "kms.temp.dir" "${KMS_TEMP}"
catalina_set_property "kms.admin.port" "${KMS_ADMIN_PORT}"
catalina_set_property "kms.http.port" "${KMS_HTTP_PORT}"