Author: suresh
Date: Mon May 9 20:19:52 2011
New Revision: 1101206
URL: http://svn.apache.org/viewvc?rev=1101206&view=rev
Log:
Merging change r1099640 from trunk
Modified:
hadoop/hdfs/branches/yahoo-merge/ (props changed)
hadoop/hdfs/branches/yahoo-merge/CHANGES.txt
hadoop/hdfs/branches/yahoo-merge/bin/distribute-exclude.sh
hadoop/hdfs/branches/yahoo-merge/bin/refresh-namenodes.sh
hadoop/hdfs/branches/yahoo-merge/bin/start-dfs.sh
hadoop/hdfs/branches/yahoo-merge/bin/stop-dfs.sh
hadoop/hdfs/branches/yahoo-merge/build.xml (props changed)
hadoop/hdfs/branches/yahoo-merge/src/c++/libhdfs/ (props changed)
hadoop/hdfs/branches/yahoo-merge/src/contrib/hdfsproxy/ (props changed)
hadoop/hdfs/branches/yahoo-merge/src/java/ (props changed)
hadoop/hdfs/branches/yahoo-merge/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java
(props changed)
hadoop/hdfs/branches/yahoo-merge/src/test/hdfs/ (props changed)
hadoop/hdfs/branches/yahoo-merge/src/webapps/datanode/ (props changed)
hadoop/hdfs/branches/yahoo-merge/src/webapps/hdfs/ (props changed)
hadoop/hdfs/branches/yahoo-merge/src/webapps/secondary/ (props changed)
Propchange: hadoop/hdfs/branches/yahoo-merge/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 9 20:19:52 2011
@@ -2,4 +2,4 @@
/hadoop/hdfs/branches/HDFS-1052:1078924,1078943,1080331,1080391,1080402,1081603,1082326,1084245,1086788,1090419
/hadoop/hdfs/branches/HDFS-265:796829-820463
/hadoop/hdfs/branches/branch-0.21:820487
-/hadoop/hdfs/trunk:987665-1004788,1026178-1028906,1032470-1033639,1034073,1034082-1034181,1034501-1034544,1035508,1036738,1052823,1060619,1061067,1062020,1062045,1062052,1080836,1087080,1091619,1092584,1095789,1097648,1097969,1098867
+/hadoop/hdfs/trunk:987665-1004788,1026178-1028906,1032470-1033639,1034073,1034082-1034181,1034501-1034544,1035508,1036738,1052823,1060619,1061067,1062020,1062045,1062052,1080836,1087080,1091619,1092584,1095789,1097648,1097969,1098867,1099640
Modified: hadoop/hdfs/branches/yahoo-merge/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/branches/yahoo-merge/CHANGES.txt?rev=1101206&r1=1101205&r2=1101206&view=diff
==============================================================================
--- hadoop/hdfs/branches/yahoo-merge/CHANGES.txt (original)
+++ hadoop/hdfs/branches/yahoo-merge/CHANGES.txt Mon May 9 20:19:52 2011
@@ -309,6 +309,8 @@ Trunk (unreleased changes)
HDFS-1860. when renewing/canceling DelegationToken over http we need to
pass exception information back to the caller.(boryas)
+ HDFS-1889. incorrect path in start/stop dfs script. (John George via eli)
+
Release 0.22.0 - Unreleased
NEW FEATURES
Modified: hadoop/hdfs/branches/yahoo-merge/bin/distribute-exclude.sh
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/branches/yahoo-merge/bin/distribute-exclude.sh?rev=1101206&r1=1101205&r2=1101206&view=diff
==============================================================================
--- hadoop/hdfs/branches/yahoo-merge/bin/distribute-exclude.sh (original)
+++ hadoop/hdfs/branches/yahoo-merge/bin/distribute-exclude.sh Mon May 9
20:19:52 2011
@@ -50,8 +50,8 @@ if [ ! -f "$excludeFilenameLocal" ] ; th
exit 1
fi
-namenodes=$("$HADOOP_HOME/bin/hdfs" getconf -namenodes)
-excludeFilenameRemote=$("$HADOOP_HOME/bin/hdfs" getconf -excludeFile)
+namenodes=$("$HADOOP_HDFS_HOME/bin/hdfs" getconf -namenodes)
+excludeFilenameRemote=$("$HADOOP_HDFS_HOME/bin/hdfs" getconf -excludeFile)
if [ "$excludeFilenameRemote" = '' ] ; then
echo \
Modified: hadoop/hdfs/branches/yahoo-merge/bin/refresh-namenodes.sh
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/branches/yahoo-merge/bin/refresh-namenodes.sh?rev=1101206&r1=1101205&r2=1101206&view=diff
==============================================================================
--- hadoop/hdfs/branches/yahoo-merge/bin/refresh-namenodes.sh (original)
+++ hadoop/hdfs/branches/yahoo-merge/bin/refresh-namenodes.sh Mon May 9
20:19:52 2011
@@ -25,11 +25,11 @@ bin=`cd "$bin"; pwd`
. "$bin/hdfs-config.sh"
-namenodes=$("$HADOOP_HOME/bin/hdfs" getconf -namenodes)
+namenodes=$("$HADOOP_HDFS_HOME/bin/hdfs" getconf -namenodes)
for namenode in $namenodes ; do
echo "Refreshing namenode [$namenode]"
- "$HADOOP_HOME/bin/hdfs" dfsadmin -refreshNodes
+ "$HADOOP_HDFS_HOME/bin/hdfs" dfsadmin -refreshNodes
if [ "$?" != '0' ] ; then errorFlag='1' ; fi
done
Modified: hadoop/hdfs/branches/yahoo-merge/bin/start-dfs.sh
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/branches/yahoo-merge/bin/start-dfs.sh?rev=1101206&r1=1101205&r2=1101206&view=diff
==============================================================================
--- hadoop/hdfs/branches/yahoo-merge/bin/start-dfs.sh (original)
+++ hadoop/hdfs/branches/yahoo-merge/bin/start-dfs.sh Mon May 9 20:19:52 2011
@@ -47,7 +47,7 @@ fi
#---------------------------------------------------------
# namenodes
-NAMENODES=$($HADOOP_HOME/bin/hdfs getconf -namenodes)
+NAMENODES=$($HADOOP_HDFS_HOME/bin/hdfs getconf -namenodes)
echo "Starting namenodes on [$NAMENODES]"
@@ -74,7 +74,7 @@ fi
# if there are no secondary namenodes configured it returns
# 0.0.0.0 or empty string
-SECONDARY_NAMENODES=$($HADOOP_HOME/bin/hdfs getconf -secondarynamenodes 2>&-)
+SECONDARY_NAMENODES=$($HADOOP_HDFS_HOME/bin/hdfs getconf -secondarynamenodes
2>&-)
SECONDARY_NAMENODES=${SECONDARY_NAMENODES:='0.0.0.0'}
if [ "$SECONDARY_NAMENODES" = '0.0.0.0' ] ; then
Modified: hadoop/hdfs/branches/yahoo-merge/bin/stop-dfs.sh
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/branches/yahoo-merge/bin/stop-dfs.sh?rev=1101206&r1=1101205&r2=1101206&view=diff
==============================================================================
--- hadoop/hdfs/branches/yahoo-merge/bin/stop-dfs.sh (original)
+++ hadoop/hdfs/branches/yahoo-merge/bin/stop-dfs.sh Mon May 9 20:19:52 2011
@@ -23,7 +23,7 @@ bin=`cd "$bin"; pwd`
#---------------------------------------------------------
# namenodes
-NAMENODES=$($HADOOP_HOME/bin/hdfs getconf -namenodes)
+NAMENODES=$($HADOOP_HDFS_HOME/bin/hdfs getconf -namenodes)
echo "Stopping namenodes on [$NAMENODES]"
@@ -50,7 +50,7 @@ fi
# if there are no secondary namenodes configured it returns
# 0.0.0.0 or empty string
-SECONDARY_NAMENODES=$($HADOOP_HOME/bin/hdfs getconf -secondarynamenodes 2>&-)
+SECONDARY_NAMENODES=$($HADOOP_HDFS_HOME/bin/hdfs getconf -secondarynamenodes
2>&-)
SECONDARY_NAMENODES=${SECONDARY_NAMENODES:-'0.0.0.0'}
if [ "$SECONDARY_NAMENODES" = '0.0.0.0' ] ; then
Propchange: hadoop/hdfs/branches/yahoo-merge/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 9 20:19:52 2011
@@ -3,4 +3,4 @@
/hadoop/hdfs/branches/HDFS-1052/build.xml:1078924,1078943,1080331,1080391,1080402,1081603,1082326,1084245,1086788,1090419
/hadoop/hdfs/branches/HDFS-265/build.xml:796829-820463
/hadoop/hdfs/branches/branch-0.21/build.xml:820487
-/hadoop/hdfs/trunk/build.xml:987665-1004788,1026178-1028906,1032470-1033639,1034073,1034082-1034181,1034501-1034544,1035508,1052823,1060619,1061067,1062020,1062045,1062052,1080836,1087080,1091619,1092584,1095789,1097648,1097969,1098867
+/hadoop/hdfs/trunk/build.xml:987665-1004788,1026178-1028906,1032470-1033639,1034073,1034082-1034181,1034501-1034544,1035508,1052823,1060619,1061067,1062020,1062045,1062052,1080836,1087080,1091619,1092584,1095789,1097648,1097969,1098867,1099640
Propchange: hadoop/hdfs/branches/yahoo-merge/src/c++/libhdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 9 20:19:52 2011
@@ -1,4 +1,4 @@
/hadoop/core/branches/branch-0.19/mapred/src/c++/libhdfs:713112
/hadoop/core/trunk/src/c++/libhdfs:776175-784663
/hadoop/hdfs/branches/HDFS-1052/src/c++/libhdfs:1078924,1078943,1080331,1080391,1080402,1081603,1082326,1084245,1086788,1090419
-/hadoop/hdfs/trunk/src/c++/libhdfs:987665-1004788,1026178-1028906,1032470-1033639,1034073,1034082-1034181,1034501-1034544,1035508,1052823,1060619,1061067,1062020,1062045,1062052,1080836,1087080,1091619,1092584,1095789,1097648,1097969,1098867
+/hadoop/hdfs/trunk/src/c++/libhdfs:987665-1004788,1026178-1028906,1032470-1033639,1034073,1034082-1034181,1034501-1034544,1035508,1052823,1060619,1061067,1062020,1062045,1062052,1080836,1087080,1091619,1092584,1095789,1097648,1097969,1098867,1099640
Propchange: hadoop/hdfs/branches/yahoo-merge/src/contrib/hdfsproxy/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 9 20:19:52 2011
@@ -3,4 +3,4 @@
/hadoop/hdfs/branches/HDFS-1052/src/contrib/hdfsproxy:1078924,1078943,1080331,1080391,1080402,1081603,1082326,1084245,1086788,1090419
/hadoop/hdfs/branches/HDFS-265/src/contrib/hdfsproxy:796829-820463
/hadoop/hdfs/branches/branch-0.21/src/contrib/hdfsproxy:820487
-/hadoop/hdfs/trunk/src/contrib/hdfsproxy:987665-1004788,1026178-1028906,1032470-1033639,1034073,1034082-1034181,1034501-1034544,1035508,1052823,1060619,1061067,1062020,1062045,1062052,1080836,1087080,1091619,1092584,1095789,1097648,1097969,1098867
+/hadoop/hdfs/trunk/src/contrib/hdfsproxy:987665-1004788,1026178-1028906,1032470-1033639,1034073,1034082-1034181,1034501-1034544,1035508,1052823,1060619,1061067,1062020,1062045,1062052,1080836,1087080,1091619,1092584,1095789,1097648,1097969,1098867,1099640
Propchange: hadoop/hdfs/branches/yahoo-merge/src/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 9 20:19:52 2011
@@ -3,4 +3,4 @@
/hadoop/hdfs/branches/HDFS-1052/src/java:1078924,1078943,1080331,1080391,1080402,1081603,1082326,1084245,1086788,1090419
/hadoop/hdfs/branches/HDFS-265/src/java:796829-820463
/hadoop/hdfs/branches/branch-0.21/src/java:820487
-/hadoop/hdfs/trunk/src/java:987665-1004788,1026178-1028906,1032470-1033639,1034073,1034082-1034181,1034501-1034544,1035508,1052823,1060619,1061067,1062020,1062045,1062052,1080836,1087080,1091619,1092584,1095789,1097648,1097969,1098867
+/hadoop/hdfs/trunk/src/java:987665-1004788,1026178-1028906,1032470-1033639,1034073,1034082-1034181,1034501-1034544,1035508,1052823,1060619,1061067,1062020,1062045,1062052,1080836,1087080,1091619,1092584,1095789,1097648,1097969,1098867,1099640
Propchange:
hadoop/hdfs/branches/yahoo-merge/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 9 20:19:52 2011
@@ -5,4 +5,4 @@
/hadoop/hdfs/branches/HDFS-1052/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java:1078924,1078943,1080331,1080391,1080402,1081603,1082326,1084245,1086788,1090419
/hadoop/hdfs/branches/HDFS-265/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java:796829-820463
/hadoop/hdfs/branches/branch-0.21/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java:820487
-/hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java:1026178-1028906,1032470-1033639,1034073,1034082-1034181,1034501-1034544,1035508,1052823,1060619,1061067,1062020,1062045,1062052,1080836,1087080,1091619,1092584,1095789,1097648,1097969,1098867
+/hadoop/hdfs/trunk/src/java/org/apache/hadoop/hdfs/server/datanode/ReplicaInfo.java:1026178-1028906,1032470-1033639,1034073,1034082-1034181,1034501-1034544,1035508,1052823,1060619,1061067,1062020,1062045,1062052,1080836,1087080,1091619,1092584,1095789,1097648,1097969,1098867,1099640
Propchange: hadoop/hdfs/branches/yahoo-merge/src/test/hdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 9 20:19:52 2011
@@ -3,4 +3,4 @@
/hadoop/hdfs/branches/HDFS-1052/src/test/hdfs:1078924,1078943,1080331,1080391,1080402,1081603,1082326,1084245,1086788,1090419
/hadoop/hdfs/branches/HDFS-265/src/test/hdfs:796829-820463
/hadoop/hdfs/branches/branch-0.21/src/test/hdfs:820487
-/hadoop/hdfs/trunk/src/test/hdfs:987665-1004788,1026178-1028906,1032470-1033639,1034073,1034082-1034181,1034501-1034544,1035508,1052823,1060619,1061067,1062020,1062045,1062052,1080836,1087080,1091619,1092584,1095789,1097648,1097969,1098867
+/hadoop/hdfs/trunk/src/test/hdfs:987665-1004788,1026178-1028906,1032470-1033639,1034073,1034082-1034181,1034501-1034544,1035508,1052823,1060619,1061067,1062020,1062045,1062052,1080836,1087080,1091619,1092584,1095789,1097648,1097969,1098867,1099640
Propchange: hadoop/hdfs/branches/yahoo-merge/src/webapps/datanode/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 9 20:19:52 2011
@@ -3,4 +3,4 @@
/hadoop/hdfs/branches/HDFS-1052/src/webapps/datanode:1078924,1078943,1080331,1080391,1080402,1081603,1082326,1084245,1086788,1090419
/hadoop/hdfs/branches/HDFS-265/src/webapps/datanode:796829-820463
/hadoop/hdfs/branches/branch-0.21/src/webapps/datanode:820487
-/hadoop/hdfs/trunk/src/webapps/datanode:987665-1004788,1026178-1028906,1032470-1033639,1034073,1034082-1034181,1034501-1034544,1035508,1052823,1060619,1061067,1062020,1062045,1062052,1080836,1087080,1091619,1092584,1095789,1097648,1097969,1098867
+/hadoop/hdfs/trunk/src/webapps/datanode:987665-1004788,1026178-1028906,1032470-1033639,1034073,1034082-1034181,1034501-1034544,1035508,1052823,1060619,1061067,1062020,1062045,1062052,1080836,1087080,1091619,1092584,1095789,1097648,1097969,1098867,1099640
Propchange: hadoop/hdfs/branches/yahoo-merge/src/webapps/hdfs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 9 20:19:52 2011
@@ -3,4 +3,4 @@
/hadoop/hdfs/branches/HDFS-1052/src/webapps/hdfs:1078924,1078943,1080331,1080391,1080402,1081603,1082326,1084245,1086788,1090419
/hadoop/hdfs/branches/HDFS-265/src/webapps/hdfs:796829-820463
/hadoop/hdfs/branches/branch-0.21/src/webapps/hdfs:820487
-/hadoop/hdfs/trunk/src/webapps/hdfs:987665-1004788,1026178-1028906,1032470-1033639,1034073,1034082-1034181,1034501-1034544,1035508,1052823,1060619,1061067,1062020,1062045,1062052,1080836,1087080,1091619,1092584,1095789,1097648,1097969,1098867
+/hadoop/hdfs/trunk/src/webapps/hdfs:987665-1004788,1026178-1028906,1032470-1033639,1034073,1034082-1034181,1034501-1034544,1035508,1052823,1060619,1061067,1062020,1062045,1062052,1080836,1087080,1091619,1092584,1095789,1097648,1097969,1098867,1099640
Propchange: hadoop/hdfs/branches/yahoo-merge/src/webapps/secondary/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 9 20:19:52 2011
@@ -3,4 +3,4 @@
/hadoop/hdfs/branches/HDFS-1052/src/webapps/secondary:1078924,1078943,1080331,1080391,1080402,1081603,1082326,1084245,1086788,1090419
/hadoop/hdfs/branches/HDFS-265/src/webapps/secondary:796829-820463
/hadoop/hdfs/branches/branch-0.21/src/webapps/secondary:820487
-/hadoop/hdfs/trunk/src/webapps/secondary:987665-1004788,1026178-1028906,1032470-1033639,1034073,1034082-1034181,1034501-1034544,1035508,1052823,1060619,1061067,1062020,1062045,1062052,1080836,1087080,1091619,1092584,1095789,1097648,1097969,1098867
+/hadoop/hdfs/trunk/src/webapps/secondary:987665-1004788,1026178-1028906,1032470-1033639,1034073,1034082-1034181,1034501-1034544,1035508,1052823,1060619,1061067,1062020,1062045,1062052,1080836,1087080,1091619,1092584,1095789,1097648,1097969,1098867,1099640
