HADOOP-13117. clarify daemonization and security vars for dynamic commands
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7e51f528 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7e51f528 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7e51f528 Branch: refs/heads/HADOOP-12930 Commit: 7e51f528abf8ee311be64197b2affa59c67559ad Parents: 0696186 Author: Allen Wittenauer <[email protected]> Authored: Sun May 8 21:09:40 2016 -0700 Committer: Allen Wittenauer <[email protected]> Committed: Thu May 12 16:01:27 2016 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/src/main/bin/hadoop | 8 ++++---- hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs | 8 ++++---- hadoop-mapreduce-project/bin/mapred | 8 ++++---- hadoop-yarn-project/hadoop-yarn/bin/yarn | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/7e51f528/hadoop-common-project/hadoop-common/src/main/bin/hadoop ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/bin/hadoop b/hadoop-common-project/hadoop-common/src/main/bin/hadoop index b26525a..61fdc2e 100755 --- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop +++ b/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}" \ http://git-wip-us.apache.org/repos/asf/hadoop/blob/7e51f528/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs b/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs index 7296271..19a81d5 100755 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs +++ b/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 \ No newline at end of file +fi http://git-wip-us.apache.org/repos/asf/hadoop/blob/7e51f528/hadoop-mapreduce-project/bin/mapred ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/bin/mapred b/hadoop-mapreduce-project/bin/mapred index 6ab0854..c929d98 100755 --- a/hadoop-mapreduce-project/bin/mapred +++ b/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 \ No newline at end of file +fi http://git-wip-us.apache.org/repos/asf/hadoop/blob/7e51f528/hadoop-yarn-project/hadoop-yarn/bin/yarn ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/bin/yarn b/hadoop-yarn-project/hadoop-yarn/bin/yarn index 57f582c..bb8b17a 100755 --- a/hadoop-yarn-project/hadoop-yarn/bin/yarn +++ b/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}" \ --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
