hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sur...@apache.org
Subject svn commit: r1383562 - in /hadoop/common/branches/branch-1: CHANGES.txt bin/hadoop-config.sh bin/slaves.sh
Date Tue, 11 Sep 2012 19:11:36 GMT
Author: suresh
Date: Tue Sep 11 19:11:35 2012
New Revision: 1383562

URL: http://svn.apache.org/viewvc?rev=1383562&view=rev
Log:
HADOOP-8767. Secondary namenode is started on slave nodes instead of master nodes. Contributed
by Giovanni Delussu.

Modified:
    hadoop/common/branches/branch-1/CHANGES.txt
    hadoop/common/branches/branch-1/bin/hadoop-config.sh
    hadoop/common/branches/branch-1/bin/slaves.sh

Modified: hadoop/common/branches/branch-1/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/CHANGES.txt?rev=1383562&r1=1383561&r2=1383562&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1/CHANGES.txt Tue Sep 11 19:11:35 2012
@@ -236,6 +236,9 @@ Release 1.2.0 - unreleased
     MAPREDUCE-4576. Large dist cache can block tasktracker heartbeat
     (Robert Evans via tgraves)
 
+    HADOOP-8767. Secondary namenode is started on slave nodes instead of
+    master nodes. (Giovanni Delussu via suresh)
+
 Release 1.1.0 - unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/branches/branch-1/bin/hadoop-config.sh
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/bin/hadoop-config.sh?rev=1383562&r1=1383561&r2=1383562&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/bin/hadoop-config.sh (original)
+++ hadoop/common/branches/branch-1/bin/hadoop-config.sh Tue Sep 11 19:11:35 2012
@@ -53,6 +53,10 @@ else
 fi
 HADOOP_CONF_DIR="${HADOOP_CONF_DIR:-$HADOOP_PREFIX/$DEFAULT_CONF_DIR}"
 
+if [ -f "${HADOOP_CONF_DIR}/hadoop-env.sh" ]; then
+  . "${HADOOP_CONF_DIR}/hadoop-env.sh"
+fi
+
 #check to see it is specified whether to use the slaves or the
 # masters file
 if [ $# -gt 1 ]
@@ -66,9 +70,6 @@ then
     fi
 fi
 
-if [ -f "${HADOOP_CONF_DIR}/hadoop-env.sh" ]; then
-  . "${HADOOP_CONF_DIR}/hadoop-env.sh"
-fi
 
 if [ "$HADOOP_HOME_WARN_SUPPRESS" = "" ] && [ "$HADOOP_HOME" != "" ]; then
   echo "Warning: \$HADOOP_HOME is deprecated." 1>&2

Modified: hadoop/common/branches/branch-1/bin/slaves.sh
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1/bin/slaves.sh?rev=1383562&r1=1383561&r2=1383562&view=diff
==============================================================================
--- hadoop/common/branches/branch-1/bin/slaves.sh (original)
+++ hadoop/common/branches/branch-1/bin/slaves.sh Tue Sep 11 19:11:35 2012
@@ -38,21 +38,18 @@ fi
 bin=`dirname "$0"`
 bin=`cd "$bin"; pwd`
 
-if [ -e "$bin/../libexec/hadoop-config.sh" ]; then
-  . "$bin"/../libexec/hadoop-config.sh
-else
-  . "$bin/hadoop-config.sh"
-fi
-
 # If the slaves file is specified in the command line,
 # then it takes precedence over the definition in 
 # hadoop-env.sh. Save it here.
 HOSTLIST=$HADOOP_SLAVES
 
-if [ -f "${HADOOP_CONF_DIR}/hadoop-env.sh" ]; then
-  . "${HADOOP_CONF_DIR}/hadoop-env.sh"
+if [ -e "$bin/../libexec/hadoop-config.sh" ]; then
+  . "$bin"/../libexec/hadoop-config.sh
+else
+  . "$bin/hadoop-config.sh"
 fi
 
+
 if [ "$HOSTLIST" = "" ]; then
   if [ "$HADOOP_SLAVES" = "" ]; then
     export HOSTLIST="${HADOOP_CONF_DIR}/slaves"



Mime
View raw message