hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject [09/16] hadoop git commit: HADOOP-13089. hadoop distcp adds client opts twice when dynamic
Date Fri, 06 May 2016 21:11:27 GMT
HADOOP-13089. hadoop distcp adds client opts twice when dynamic


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3887def0
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3887def0
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3887def0

Branch: refs/heads/HADOOP-12930
Commit: 3887def0a7a354e751008d32a355956063e6abb5
Parents: 219a629
Author: Allen Wittenauer <aw@apache.org>
Authored: Wed May 4 10:50:15 2016 -0700
Committer: Allen Wittenauer <aw@apache.org>
Committed: Fri May 6 14:10:19 2016 -0700

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/src/main/bin/hadoop | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/3887def0/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 e4df229..e8e58f2 100755
--- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop
+++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop
@@ -167,6 +167,10 @@ function hadoopcmd_case
       fi
     ;;
   esac
+
+  # Always respect HADOOP_OPTS and HADOOP_CLIENT_OPTS
+  hadoop_debug "Appending HADOOP_CLIENT_OPTS onto HADOOP_OPTS"
+  HADOOP_OPTS="${HADOOP_OPTS} ${HADOOP_CLIENT_OPTS}"
 }
 
 # This script runs the hadoop core commands.
@@ -209,10 +213,6 @@ if [[ ${HADOOP_SLAVE_MODE} = true ]]; then
   exit $?
 fi
 
-# Always respect HADOOP_OPTS and HADOOP_CLIENT_OPTS
-hadoop_debug "Appending HADOOP_CLIENT_OPTS onto HADOOP_OPTS"
-HADOOP_OPTS="${HADOOP_OPTS} ${HADOOP_CLIENT_OPTS}"
-
 if [[ -n "${HADOOP_SUBCMD_SECURESERVICE}" ]]; then
   HADOOP_SECURE_USER="${HADOOP_SUBCMD_SECUREUSER}"
   hadoop_verify_secure_prereq


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


Mime
View raw message