You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by rv...@apache.org on 2017/03/15 02:09:37 UTC
bigtop git commit: BIGTOP-2697. Back port HADOOP-12366 into Bigtop
Repository: bigtop
Updated Branches:
refs/heads/master d86f0da78 -> bab2d48cd
BIGTOP-2697. Back port HADOOP-12366 into Bigtop
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/bab2d48c
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/bab2d48c
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/bab2d48c
Branch: refs/heads/master
Commit: bab2d48cd1e23c0f5992e643a75cf63335fd36d1
Parents: d86f0da
Author: Roman Shaposhnik <rv...@apache.org>
Authored: Mon Mar 13 17:02:15 2017 -0700
Committer: Roman Shaposhnik <rv...@apache.org>
Committed: Mon Mar 13 17:02:15 2017 -0700
----------------------------------------------------------------------
...0-HADOOP-12366.-expose-calculated-paths.diff | 125 +++++++++++++++++++
1 file changed, 125 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/bab2d48c/bigtop-packages/src/common/hadoop/patch0-HADOOP-12366.-expose-calculated-paths.diff
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hadoop/patch0-HADOOP-12366.-expose-calculated-paths.diff b/bigtop-packages/src/common/hadoop/patch0-HADOOP-12366.-expose-calculated-paths.diff
new file mode 100644
index 0000000..b0c831c
--- /dev/null
+++ b/bigtop-packages/src/common/hadoop/patch0-HADOOP-12366.-expose-calculated-paths.diff
@@ -0,0 +1,125 @@
+From 3131744ed6e1e874d7cd0666208adc424fec3224 Mon Sep 17 00:00:00 2001
+From: Konstantin Boudnik <co...@boudnik.org>
+Date: Mon, 15 Feb 2016 10:42:16 +0300
+Subject: [PATCH] HADOOP-12366. expose calculated paths
+
+Adapted the patch to apply cleanly on branch-2.7.1
+---
+ 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 insertions(+)
+
+diff --git a/hadoop-common-project/hadoop-common/src/main/bin/hadoop b/hadoop-common-project/hadoop-common/src/main/bin/hadoop
+index a5e8885..715ad9b 100755
+--- a/hadoop-common-project/hadoop-common/src/main/bin/hadoop
++++ b/hadoop-common-project/hadoop-common/src/main/bin/hadoop
+@@ -38,6 +38,7 @@ 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 " credential interact with credential providers"
+@@ -116,6 +117,15 @@ 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}
+diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs b/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs
+index 155df14..b744761 100755
+--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs
++++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/hdfs
+@@ -46,6 +46,7 @@ function print_usage(){
+ echo " zkfc run the ZK Failover Controller daemon"
+ echo " datanode run a DFS datanode"
+ 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"
+@@ -160,6 +161,14 @@ 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"
+diff --git a/hadoop-mapreduce-project/bin/mapred b/hadoop-mapreduce-project/bin/mapred
+index fe16e07..6a21fed 100755
+--- a/hadoop-mapreduce-project/bin/mapred
++++ b/hadoop-mapreduce-project/bin/mapred
+@@ -38,6 +38,7 @@ 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 " hsadmin job history server admin interface"
+ echo ""
+@@ -74,6 +75,14 @@ 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"
+diff --git a/hadoop-yarn-project/hadoop-yarn/bin/yarn b/hadoop-yarn-project/hadoop-yarn/bin/yarn
+index 71347a2..ce3e24a 100644
+--- a/hadoop-yarn-project/hadoop-yarn/bin/yarn
++++ b/hadoop-yarn-project/hadoop-yarn/bin/yarn
+@@ -87,6 +87,7 @@ 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 ""
+ echo "Most commands print help when invoked w/o parameters."
+ }
+@@ -214,6 +215,14 @@ 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"
+--
+2.0.4
+