You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by aw...@apache.org on 2016/03/09 18:59:24 UTC
hadoop git commit: Revert "HADOOP-12366. expose calculated paths (aw)"
Repository: hadoop
Updated Branches:
refs/heads/branch-2 a06ecb085 -> 9f4b3eaac
Revert "HADOOP-12366. expose calculated paths (aw)"
This reverts commit 45bb467918ce986760ba5f7a948cf016656f0e57.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9f4b3eaa
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9f4b3eaa
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9f4b3eaa
Branch: refs/heads/branch-2
Commit: 9f4b3eaac03c9777ed3696847a6c47896b16a134
Parents: a06ecb0
Author: Allen Wittenauer <aw...@apache.org>
Authored: Wed Mar 9 09:55:27 2016 -0800
Committer: Allen Wittenauer <aw...@apache.org>
Committed: Wed Mar 9 09:59:19 2016 -0800
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/src/main/bin/hadoop | 10 ----------
hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs | 9 ---------
hadoop-mapreduce-project/bin/mapred | 9 ---------
hadoop-yarn-project/hadoop-yarn/bin/yarn | 9 ---------
4 files changed, 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9f4b3eaa/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 44be2e3..1575996 100755
--- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop
+++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop
@@ -38,7 +38,6 @@ function print_usage(){
echo " YARN applications, not this command."
echo " checknative [-a|-h] check native hadoop and compression libraries availability"
echo " distcp <srcurl> <desturl> copy file or directories recursively"
- echo " envvars display computed Hadoop environment variables"
echo " archive -archiveName NAME -p <parent path> <src>* <dest> create a hadoop archive"
echo " classpath prints the class path needed to get the"
echo " Hadoop jar and the required libraries"
@@ -117,15 +116,6 @@ case $COMMAND in
CLASSPATH=${CLASSPATH}:${TOOL_PATH}
elif [ "$COMMAND" = "daemonlog" ] ; then
CLASS=org.apache.hadoop.log.LogLevel
- elif [ "$COMMAND" = "envvars" ] ; then
- echo "JAVA_HOME='${JAVA_HOME}'"
- echo "HADOOP_COMMON_HOME='${HADOOP_COMMON_HOME}'"
- echo "HADOOP_COMMON_DIR='${HADOOP_COMMON_DIR}'"
- echo "HADOOP_COMMON_LIB_JARS_DIR='${HADOOP_COMMON_LIB_JARS_DIR}'"
- echo "HADOOP_COMMON_LIB_NATIVE_DIR='${HADOOP_COMMON_LIB_NATIVE_DIR}'"
- echo "HADOOP_CONF_DIR='${HADOOP_CONF_DIR}'"
- echo "HADOOP_TOOLS_PATH='${TOOL_PATH}'"
- exit 0
elif [ "$COMMAND" = "archive" ] ; then
CLASS=org.apache.hadoop.tools.HadoopArchives
CLASSPATH=${CLASSPATH}:${TOOL_PATH}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9f4b3eaa/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 714280e..fbfbaf2 100755
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs
@@ -47,7 +47,6 @@ function print_usage(){
echo " datanode run a DFS datanode"
echo " debug run a Debug Admin to execute HDFS debug commands"
echo " dfsadmin run a DFS admin client"
- echo " envvars display computed Hadoop environment variables"
echo " haadmin run a DFS HA admin client"
echo " fsck run a DFS filesystem checking utility"
echo " balancer run a cluster balancing utility"
@@ -162,14 +161,6 @@ elif [ "$COMMAND" = "haadmin" ] ; then
CLASS=org.apache.hadoop.hdfs.tools.DFSHAAdmin
CLASSPATH=${CLASSPATH}:${TOOL_PATH}
HADOOP_OPTS="$HADOOP_OPTS $HADOOP_CLIENT_OPTS"
-elif [ "$COMMAND" = "envvars" ] ; then
- echo "JAVA_HOME='${JAVA_HOME}'"
- echo "HADOOP_HDFS_HOME='${HADOOP_HDFS_HOME}'"
- echo "HDFS_DIR='${HDFS_DIR}'"
- echo "HDFS_LIB_JARS_DIR='${HDFS_LIB_JARS_DIR}'"
- echo "HADOOP_CONF_DIR='${HADOOP_CONF_DIR}'"
- echo "HADOOP_TOOLS_PATH='${TOOL_PATH}'"
- exit 0
elif [ "$COMMAND" = "fsck" ] ; then
CLASS=org.apache.hadoop.hdfs.tools.DFSck
HADOOP_OPTS="$HADOOP_OPTS $HADOOP_CLIENT_OPTS"
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9f4b3eaa/hadoop-mapreduce-project/bin/mapred
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/bin/mapred b/hadoop-mapreduce-project/bin/mapred
index fd1300d..6f3bc04 100755
--- a/hadoop-mapreduce-project/bin/mapred
+++ b/hadoop-mapreduce-project/bin/mapred
@@ -38,7 +38,6 @@ function print_usage(){
echo " mapreduce subcommands"
echo " historyserver run job history servers as a standalone daemon"
echo " distcp <srcurl> <desturl> copy file or directories recursively"
- echo " envvars display computed Hadoop environment variables"
echo " archive -archiveName NAME -p <parent path> <src>* <dest> create a hadoop archive"
echo " archive-logs combine aggregated logs into hadoop archives"
echo " hsadmin job history server admin interface"
@@ -76,14 +75,6 @@ elif [ "$COMMAND" = "sampler" ] ; then
HADOOP_OPTS="$HADOOP_OPTS $HADOOP_CLIENT_OPTS"
elif [ "$COMMAND" = "classpath" ] ; then
echo -n
-elif [ "$COMMAND" = "envvars" ] ; then
- echo "JAVA_HOME='${JAVA_HOME}'"
- echo "HADOOP_MAPRED_HOME='${HADOOP_MAPRED_HOME}'"
- echo "MAPRED_DIR='${MAPRED_DIR}'"
- echo "MAPRED_LIB_JARS_DIR='${MAPRED_LIB_JARS_DIR}'"
- echo "HADOOP_CONF_DIR=${HADOOP_CONF_DIR}'"
- echo "HADOOP_TOOLS_PATH='${TOOL_PATH}'"
- exit 0
elif [ "$COMMAND" = "historyserver" ] ; then
CLASS=org.apache.hadoop.mapreduce.v2.hs.JobHistoryServer
HADOOP_OPTS="$HADOOP_OPTS -Dmapred.jobsummary.logger=${HADOOP_JHS_LOGGER:-INFO,console} $HADOOP_JOB_HISTORYSERVER_OPTS"
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9f4b3eaa/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 5495387..552cef4 100644
--- a/hadoop-yarn-project/hadoop-yarn/bin/yarn
+++ b/hadoop-yarn-project/hadoop-yarn/bin/yarn
@@ -89,7 +89,6 @@ function print_usage(){
echo " cluster prints cluster information"
echo " daemonlog get/set the log level for each"
echo " daemon"
- echo " envvars display computed Hadoop environment variables"
echo " top run cluster usage tool"
echo ""
echo "Most commands print help when invoked w/o parameters."
@@ -218,14 +217,6 @@ if [ "$COMMAND" = "classpath" ] ; then
echo $CLASSPATH
exit 0
fi
-elif [ "$COMMAND" = "envvars" ] ; then
- echo "JAVA_HOME='${JAVA_HOME}'"
- echo "HADOOP_YARN_HOME='${HADOOP_YARN_HOME}'"
- echo "YARN_DIR='${YARN_DIR}'"
- echo "YARN_LIB_JARS_DIR='${YARN_LIB_JARS_DIR}'"
- echo "HADOOP_CONF_DIR='${HADOOP_CONF_DIR}'"
- echo "HADOOP_TOOLS_PATH='${TOOL_PATH}'"
- exit 0
elif [ "$COMMAND" = "rmadmin" ] ; then
CLASS='org.apache.hadoop.yarn.client.cli.RMAdminCLI'
YARN_OPTS="$YARN_OPTS $YARN_CLIENT_OPTS"