Prechádzať zdrojové kódy

HADOOP-13117. clarify daemonization and security vars for dynamic commands

Allen Wittenauer 9 rokov pred
rodič
commit
f3e772c69d

+ 4 - 4
hadoop-common-project/hadoop-common/src/main/bin/hadoop

@@ -205,11 +205,11 @@ fi
 hadoop_verify_user "${HADOOP_SUBCMD}"
 
 if [[ ${HADOOP_SLAVE_MODE} = true ]]; then
-  hadoop_common_slave_mode_execute "${HADOOP_HDFS_HOME}/bin/hadoop" "${HADOOP_USER_PARAMS[@]}"
+  hadoop_common_slave_mode_execute "${HADOOP_COMMON_HOME}/bin/hadoop" "${HADOOP_USER_PARAMS[@]}"
   exit $?
 fi
 
-if [[ -n "${HADOOP_SUBCMD_SECURESERVICE}" ]]; then
+if [[ "${HADOOP_SUBCMD_SECURESERVICE}" = true ]]; then
   HADOOP_SECURE_USER="${HADOOP_SUBCMD_SECUREUSER}"
   hadoop_verify_secure_prereq
   hadoop_setup_secure_service
@@ -237,8 +237,8 @@ fi
 
 hadoop_finalize
 
-if [[ -n "${HADOOP_SUBCMD_SUPPORTDAEMONIZATION}" ]]; then
-  if [[ -n "${HADOOP_SUBCMD_SECURESERVICE}" ]]; then
+if [[ "${HADOOP_SUBCMD_SUPPORTDAEMONIZATION}" = true ]]; then
+  if [[ "${HADOOP_SUBCMD_SECURESERVICE}" = true ]]; then
     hadoop_secure_daemon_handler \
       "${HADOOP_DAEMON_MODE}" \
       "${HADOOP_SUBCMD}" \

+ 4 - 4
hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs

@@ -291,7 +291,7 @@ if [[ ${HADOOP_SLAVE_MODE} = true ]]; then
   exit $?
 fi
 
-if [[ -n "${HADOOP_SUBCMD_SECURESERVICE}" ]]; then
+if [[ "${HADOOP_SUBCMD_SECURESERVICE}" = true ]]; then
   HADOOP_SECURE_USER="${HADOOP_SUBCMD_SECUREUSER}"
   hadoop_verify_secure_prereq
   hadoop_setup_secure_service
@@ -319,8 +319,8 @@ fi
 
 hadoop_finalize
 
-if [[ -n "${HADOOP_SUBCMD_SUPPORTDAEMONIZATION}" ]]; then
-  if [[ -n "${HADOOP_SUBCMD_SECURESERVICE}" ]]; then
+if [[ "${HADOOP_SUBCMD_SUPPORTDAEMONIZATION}" = true ]]; then
+  if [[ "${HADOOP_SUBCMD_SECURESERVICE}" = true ]]; then
     hadoop_secure_daemon_handler \
       "${HADOOP_DAEMON_MODE}" \
       "${HADOOP_SUBCMD}" \
@@ -344,4 +344,4 @@ if [[ -n "${HADOOP_SUBCMD_SUPPORTDAEMONIZATION}" ]]; then
 else
   # shellcheck disable=SC2086
   hadoop_java_exec "${HADOOP_SUBCMD}" "${HADOOP_CLASSNAME}" "${HADOOP_SUBCMD_ARGS[@]}"
-fi
+fi

+ 4 - 4
hadoop-mapreduce-project/bin/mapred

@@ -156,7 +156,7 @@ if [[ ${HADOOP_SLAVE_MODE} = true ]]; then
   exit $?
 fi
 
-if [[ -n "${HADOOP_SUBCMD_SECURESERVICE}" ]]; then
+if [[ "${HADOOP_SUBCMD_SECURESERVICE}" = true ]]; then
   HADOOP_SECURE_USER="${HADOOP_SUBCMD_SECUREUSER}"
   hadoop_verify_secure_prereq
   hadoop_setup_secure_service
@@ -180,8 +180,8 @@ fi
 
 hadoop_finalize
 
-if [[ -n "${HADOOP_SUBCMD_SUPPORTDAEMONIZATION}" ]]; then
-  if [[ -n "${HADOOP_SUBCMD_SECURESERVICE}" ]]; then
+if [[ "${HADOOP_SUBCMD_SUPPORTDAEMONIZATION}" = true ]]; then
+  if [[ "${HADOOP_SUBCMD_SECURESERVICE}" = true ]]; then
     hadoop_secure_daemon_handler \
       "${HADOOP_DAEMON_MODE}" \
       "${HADOOP_SUBCMD}" \
@@ -204,4 +204,4 @@ if [[ -n "${HADOOP_SUBCMD_SUPPORTDAEMONIZATION}" ]]; then
   exit $?
 else
   hadoop_java_exec "${HADOOP_SUBCMD}" "${HADOOP_CLASSNAME}" "${HADOOP_SUBCMD_ARGS[@]}"
-fi
+fi

+ 3 - 3
hadoop-yarn-project/hadoop-yarn/bin/yarn

@@ -268,7 +268,7 @@ if [[ ${HADOOP_SLAVE_MODE} = true ]]; then
   exit $?
 fi
 
-if [[ -n "${HADOOP_SUBCMD_SECURESERVICE}" ]]; then
+if [[ "${HADOOP_SUBCMD_SECURESERVICE}" = true ]]; then
   HADOOP_SECURE_USER="${HADOOP_SUBCMD_SECUREUSER}"
   hadoop_verify_secure_prereq
   hadoop_setup_secure_service
@@ -291,8 +291,8 @@ fi
 
 hadoop_finalize
 
-if [[ -n "${HADOOP_SUBCMD_SUPPORTDAEMONIZATION}" ]]; then
-  if [[ -n "${HADOOP_SUBCMD_SECURESERVICE}" ]]; then
+if [[ "${HADOOP_SUBCMD_SUPPORTDAEMONIZATION}" = true ]]; then
+  if [[ "${HADOOP_SUBCMD_SECURESERVICE}" = true ]]; then
     hadoop_secure_daemon_handler \
       "${HADOOP_DAEMON_MODE}" \
       "${HADOOP_SUBCMD}" \