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 el...@apache.org on 2011/10/27 20:52:56 UTC
svn commit: r1189932 - in
/hadoop/common/trunk/hadoop-common-project/hadoop-common: CHANGES.txt
src/main/bin/hadoop src/main/bin/hadoop-config.sh src/main/bin/start-all.sh
src/main/bin/stop-all.sh src/main/conf/hadoop-metrics2.properties
Author: eli
Date: Thu Oct 27 18:52:55 2011
New Revision: 1189932
URL: http://svn.apache.org/viewvc?rev=1189932&view=rev
Log:
HADOOP-7762. Common side of MR-2736. Contributed by Eli Collins
Modified:
hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/bin/hadoop
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/bin/start-all.sh
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/bin/stop-all.sh
hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/conf/hadoop-metrics2.properties
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1189932&r1=1189931&r2=1189932&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Thu Oct 27 18:52:55 2011
@@ -498,6 +498,8 @@ Release 0.23.0 - Unreleased
HADOOP-7749. Add a NetUtils createSocketAddr call which provides more
help in exception messages. (todd)
+ HADOOP-7762. Common side of MR-2736. (eli)
+
OPTIMIZATIONS
HADOOP-7333. Performance improvement in PureJavaCrc32. (Eric Caspole
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/bin/hadoop
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/bin/hadoop?rev=1189932&r1=1189931&r2=1189932&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/bin/hadoop (original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/bin/hadoop Thu Oct 27 18:52:55 2011
@@ -63,22 +63,6 @@ case $COMMAND in
fi
;;
- #mapred commands
- mradmin|jobtracker|tasktracker|pipes|job|queue)
- echo "DEPRECATED: Use of this script to execute mapred command is deprecated."
- echo "Instead use the mapred command for it."
- echo ""
- #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 "MAPRED not found."
- exit
- fi
- ;;
-
classpath)
if $cygwin; then
CLASSPATH=`cygpath -p -w "$CLASSPATH"`
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh?rev=1189932&r1=1189931&r2=1189932&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh (original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh Thu Oct 27 18:52:55 2011
@@ -248,24 +248,8 @@ if $cygwin; then
HADOOP_HDFS_HOME=`cygpath -w "$HADOOP_HDFS_HOME"`
fi
-# set mapred home if mapred is present
-if [ "$HADOOP_MAPRED_HOME" = "" ]; then
- if [ -d "${HADOOP_PREFIX}/share/hadoop/mapreduce" ]; then
- HADOOP_MAPRED_HOME=$HADOOP_PREFIX
- fi
-fi
-
-if [ -d "$HADOOP_MAPRED_HOME/share/hadoop/mapreduce/webapps" ]; then
- CLASSPATH=${CLASSPATH}:$HADOOP_MAPRED_HOME/share/hadoop/mapreduce/webapps
-fi
-
-if [ -d "$HADOOP_MAPRED_HOME/share/hadoop/mapreduce/lib" ]; then
- CLASSPATH=${CLASSPATH}:$HADOOP_MAPRED_HOME/share/hadoop/mapreduce/lib'/*'
-fi
-
# cygwin path translation
if $cygwin; then
- HADOOP_MAPRED_HOME=`cygpath -w "$HADOOP_MAPRED_HOME"`
TOOL_PATH=`cygpath -p -w "$TOOL_PATH"`
fi
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/bin/start-all.sh
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/bin/start-all.sh?rev=1189932&r1=1189931&r2=1189932&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/bin/start-all.sh (original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/bin/start-all.sh Thu Oct 27 18:52:55 2011
@@ -29,8 +29,3 @@ bin=`cd "$bin"; pwd`
if [ -f "${HADOOP_HDFS_HOME}"/bin/start-dfs.sh ]; then
"${HADOOP_HDFS_HOME}"/bin/start-dfs.sh --config $HADOOP_CONF_DIR
fi
-
-# start mapred daemons if mapred is present
-if [ -f "${HADOOP_MAPRED_HOME}"/bin/start-mapred.sh ]; then
- "${HADOOP_MAPRED_HOME}"/bin/start-mapred.sh --config $HADOOP_CONF_DIR
-fi
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/bin/stop-all.sh
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/bin/stop-all.sh?rev=1189932&r1=1189931&r2=1189932&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/bin/stop-all.sh (original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/bin/stop-all.sh Thu Oct 27 18:52:55 2011
@@ -29,9 +29,3 @@ bin=`cd "$bin"; pwd`
if [ -f "${HADOOP_HDFS_HOME}"/bin/stop-dfs.sh ]; then
"${HADOOP_HDFS_HOME}"/bin/stop-dfs.sh --config $HADOOP_CONF_DIR
fi
-
-# stop mapred daemons if mapred is present
-if [ -f "${HADOOP_MAPRED_HOME}"/bin/stop-mapred.sh ]; then
- "${HADOOP_MAPRED_HOME}"/bin/stop-mapred.sh --config $HADOOP_CONF_DIR
-fi
-
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/conf/hadoop-metrics2.properties
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/conf/hadoop-metrics2.properties?rev=1189932&r1=1189931&r2=1189932&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/conf/hadoop-metrics2.properties (original)
+++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/conf/hadoop-metrics2.properties Thu Oct 27 18:52:55 2011
@@ -51,7 +51,6 @@
#*.sink.ganglia.tagsForPrefix.dfs=
#*.sink.ganglia.tagsForPrefix.rpc=
#*.sink.ganglia.tagsForPrefix.mapred=
-#*.sink.ganglia.tagsForPrefix.fairscheduler=
#namenode.sink.ganglia.servers=yourgangliahost_1:8649,yourgangliahost_2:8649