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 jl...@apache.org on 2014/11/14 22:11:03 UTC
hadoop git commit: MAPREDUCE-6161. mapred hsadmin command missing
from trunk. Contributed by Allen Wittenauer
Repository: hadoop
Updated Branches:
refs/heads/trunk f95017b3e -> 3baaa4294
MAPREDUCE-6161. mapred hsadmin command missing from trunk. Contributed by Allen Wittenauer
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3baaa429
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3baaa429
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3baaa429
Branch: refs/heads/trunk
Commit: 3baaa42945fd432e10c547d3ead57e220f64cd57
Parents: f95017b
Author: Jason Lowe <jl...@apache.org>
Authored: Fri Nov 14 21:10:06 2014 +0000
Committer: Jason Lowe <jl...@apache.org>
Committed: Fri Nov 14 21:10:06 2014 +0000
----------------------------------------------------------------------
hadoop-mapreduce-project/CHANGES.txt | 3 +++
hadoop-mapreduce-project/bin/mapred | 10 +++++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3baaa429/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 28595ca..653ad44 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -160,6 +160,9 @@ Trunk (Unreleased)
MAPREDUCE-5972. Fix typo 'programatically' in job.xml (and a few other
places) (Akira AJISAKA via aw)
+ MAPREDUCE-6161. mapred hsadmin command missing from trunk (Allen Wittenauer
+ via jlowe)
+
BREAKDOWN OF MAPREDUCE-2841 (NATIVE TASK) SUBTASKS
MAPREDUCE-5985. native-task: Fix build on macosx. Contributed by
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3baaa429/hadoop-mapreduce-project/bin/mapred
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/bin/mapred b/hadoop-mapreduce-project/bin/mapred
index 1fa5d44..9131ba7 100755
--- a/hadoop-mapreduce-project/bin/mapred
+++ b/hadoop-mapreduce-project/bin/mapred
@@ -25,8 +25,9 @@ function hadoop_usage
echo " classpath prints the class path needed for running"
echo " mapreduce subcommands"
echo " distcp <srcurl> <desturl> copy file or directories recursively"
- echo " job manipulate MapReduce jobs"
echo " historyserver run job history servers as a standalone daemon"
+ echo " hsadmin job history server admin interface"
+ echo " job manipulate MapReduce jobs"
echo " pipes run a Pipes job"
echo " queue get information regarding JobQueues"
echo " sampler sampler"
@@ -98,8 +99,15 @@ case ${COMMAND} in
fi
HADOOP_DAEMON_ROOT_LOGGER=${HADOOP_JHS_LOGGER:-$HADOOP_DAEMON_ROOT_LOGGER}
;;
+ hsadmin)
+ CLASS=org.apache.hadoop.mapreduce.v2.hs.client.HSAdmin
+ hadoop_debug "Appending HADOOP_CLIENT_OPTS onto HADOOP_OPTS"
+ HADOOP_OPTS="${HADOOP_OPTS} ${HADOOP_CLIENT_OPTS}"
+ ;;
job)
CLASS=org.apache.hadoop.mapred.JobClient
+ hadoop_debug "Appending HADOOP_CLIENT_OPTS onto HADOOP_OPTS"
+ HADOOP_OPTS="${HADOOP_OPTS} ${HADOOP_CLIENT_OPTS}"
;;
pipes)
CLASS=org.apache.hadoop.mapred.pipes.Submitter