Merge -c 1232322 from trunk to branch-0.23 to fix HADOOP-7971. Adding back job/pipes/queue commands to bin/hadoop for backward compatibility.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1232323 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Arun Murthy 2012-01-17 07:00:48 +00:00
parent d36e002fea
commit a6e6df642a
2 changed files with 21 additions and 2 deletions

View File

@ -137,6 +137,9 @@ Release 0.23.1 - Unreleased
HADOOP-7974. TestViewFsTrash incorrectly determines the user's home
directory. (harsh via eli)
HADOOP-7971. Adding back job/pipes/queue commands to bin/hadoop for
backward compatibility. (Prashath Sharma via acmurthy)
Release 0.23.0 - 2011-11-01
INCOMPATIBLE CHANGES

View File

@ -60,8 +60,24 @@ case $COMMAND in
elif [ -f "${HADOOP_PREFIX}"/bin/hdfs ]; then
exec "${HADOOP_PREFIX}"/bin/hdfs $*
else
echo "HDFS not found."
exit
echo "HADOOP_HDFS_HOME not found!"
exit 1
fi
;;
#mapred commands for backwards compatibility
pipes|job|queue)
echo "DEPRECATED: Use of this script to execute mapred command is deprecated." 1>&2
echo "Instead use the mapred command for it." 1>&2
echo "" 1>&2
#try to locate mapred and if present, delegate to it.
if [ -f "${HADOOP_MAPRED_HOME}"/bin/mapred ]; then
exec "${HADOOP_MAPRED_HOME}"/bin/mapred $*
elif [ -f "${HADOOP_PREFIX}"/bin/mapred ]; then
exec "${HADOOP_PREFIX}"/bin/mapred $*
else
echo "HADOOP_MAPRED_HOME not found!"
exit 1
fi
;;