Revert "HADOOP-12366. expose calculated paths (aw)"

This reverts commit 45bb467918.
This commit is contained in:
Allen Wittenauer 2016-03-09 09:55:27 -08:00
parent a06ecb085e
commit 9f4b3eaac0
4 changed files with 0 additions and 37 deletions

View File

@ -38,7 +38,6 @@ function print_usage(){
echo " YARN applications, not this command." echo " YARN applications, not this command."
echo " checknative [-a|-h] check native hadoop and compression libraries availability" echo " checknative [-a|-h] check native hadoop and compression libraries availability"
echo " distcp <srcurl> <desturl> copy file or directories recursively" 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 -archiveName NAME -p <parent path> <src>* <dest> create a hadoop archive"
echo " classpath prints the class path needed to get the" echo " classpath prints the class path needed to get the"
echo " Hadoop jar and the required libraries" echo " Hadoop jar and the required libraries"
@ -117,15 +116,6 @@ case $COMMAND in
CLASSPATH=${CLASSPATH}:${TOOL_PATH} CLASSPATH=${CLASSPATH}:${TOOL_PATH}
elif [ "$COMMAND" = "daemonlog" ] ; then elif [ "$COMMAND" = "daemonlog" ] ; then
CLASS=org.apache.hadoop.log.LogLevel 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 elif [ "$COMMAND" = "archive" ] ; then
CLASS=org.apache.hadoop.tools.HadoopArchives CLASS=org.apache.hadoop.tools.HadoopArchives
CLASSPATH=${CLASSPATH}:${TOOL_PATH} CLASSPATH=${CLASSPATH}:${TOOL_PATH}

View File

@ -47,7 +47,6 @@ function print_usage(){
echo " datanode run a DFS datanode" echo " datanode run a DFS datanode"
echo " debug run a Debug Admin to execute HDFS debug commands" echo " debug run a Debug Admin to execute HDFS debug commands"
echo " dfsadmin run a DFS admin client" echo " dfsadmin run a DFS admin client"
echo " envvars display computed Hadoop environment variables"
echo " haadmin run a DFS HA admin client" echo " haadmin run a DFS HA admin client"
echo " fsck run a DFS filesystem checking utility" echo " fsck run a DFS filesystem checking utility"
echo " balancer run a cluster balancing utility" echo " balancer run a cluster balancing utility"
@ -162,14 +161,6 @@ elif [ "$COMMAND" = "haadmin" ] ; then
CLASS=org.apache.hadoop.hdfs.tools.DFSHAAdmin CLASS=org.apache.hadoop.hdfs.tools.DFSHAAdmin
CLASSPATH=${CLASSPATH}:${TOOL_PATH} CLASSPATH=${CLASSPATH}:${TOOL_PATH}
HADOOP_OPTS="$HADOOP_OPTS $HADOOP_CLIENT_OPTS" 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 elif [ "$COMMAND" = "fsck" ] ; then
CLASS=org.apache.hadoop.hdfs.tools.DFSck CLASS=org.apache.hadoop.hdfs.tools.DFSck
HADOOP_OPTS="$HADOOP_OPTS $HADOOP_CLIENT_OPTS" HADOOP_OPTS="$HADOOP_OPTS $HADOOP_CLIENT_OPTS"

View File

@ -38,7 +38,6 @@ function print_usage(){
echo " mapreduce subcommands" echo " mapreduce subcommands"
echo " historyserver run job history servers as a standalone daemon" echo " historyserver run job history servers as a standalone daemon"
echo " distcp <srcurl> <desturl> copy file or directories recursively" 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 -archiveName NAME -p <parent path> <src>* <dest> create a hadoop archive"
echo " archive-logs combine aggregated logs into hadoop archives" echo " archive-logs combine aggregated logs into hadoop archives"
echo " hsadmin job history server admin interface" echo " hsadmin job history server admin interface"
@ -76,14 +75,6 @@ elif [ "$COMMAND" = "sampler" ] ; then
HADOOP_OPTS="$HADOOP_OPTS $HADOOP_CLIENT_OPTS" HADOOP_OPTS="$HADOOP_OPTS $HADOOP_CLIENT_OPTS"
elif [ "$COMMAND" = "classpath" ] ; then elif [ "$COMMAND" = "classpath" ] ; then
echo -n 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 elif [ "$COMMAND" = "historyserver" ] ; then
CLASS=org.apache.hadoop.mapreduce.v2.hs.JobHistoryServer CLASS=org.apache.hadoop.mapreduce.v2.hs.JobHistoryServer
HADOOP_OPTS="$HADOOP_OPTS -Dmapred.jobsummary.logger=${HADOOP_JHS_LOGGER:-INFO,console} $HADOOP_JOB_HISTORYSERVER_OPTS" HADOOP_OPTS="$HADOOP_OPTS -Dmapred.jobsummary.logger=${HADOOP_JHS_LOGGER:-INFO,console} $HADOOP_JOB_HISTORYSERVER_OPTS"

View File

@ -89,7 +89,6 @@ function print_usage(){
echo " cluster prints cluster information" echo " cluster prints cluster information"
echo " daemonlog get/set the log level for each" echo " daemonlog get/set the log level for each"
echo " daemon" echo " daemon"
echo " envvars display computed Hadoop environment variables"
echo " top run cluster usage tool" echo " top run cluster usage tool"
echo "" echo ""
echo "Most commands print help when invoked w/o parameters." echo "Most commands print help when invoked w/o parameters."
@ -218,14 +217,6 @@ if [ "$COMMAND" = "classpath" ] ; then
echo $CLASSPATH echo $CLASSPATH
exit 0 exit 0
fi 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 elif [ "$COMMAND" = "rmadmin" ] ; then
CLASS='org.apache.hadoop.yarn.client.cli.RMAdminCLI' CLASS='org.apache.hadoop.yarn.client.cli.RMAdminCLI'
YARN_OPTS="$YARN_OPTS $YARN_CLIENT_OPTS" YARN_OPTS="$YARN_OPTS $YARN_CLIENT_OPTS"