Return-Path: X-Original-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org Delivered-To: apmail-hadoop-hdfs-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 47D169121 for ; Mon, 6 Feb 2012 08:53:47 +0000 (UTC) Received: (qmail 35900 invoked by uid 500); 6 Feb 2012 08:53:46 -0000 Delivered-To: apmail-hadoop-hdfs-commits-archive@hadoop.apache.org Received: (qmail 35689 invoked by uid 500); 6 Feb 2012 08:53:25 -0000 Mailing-List: contact hdfs-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: hdfs-dev@hadoop.apache.org Delivered-To: mailing list hdfs-commits@hadoop.apache.org Received: (qmail 35672 invoked by uid 99); 6 Feb 2012 08:53:16 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Feb 2012 08:53:16 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Feb 2012 08:53:12 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4F6D723888FD; Mon, 6 Feb 2012 08:52:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1240928 - in /hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs: CHANGES.txt src/main/bin/start-dfs.sh src/main/bin/stop-dfs.sh src/main/docs/src/documentation/content/xdocs/hdfs_user_guide.xml Date: Mon, 06 Feb 2012 08:52:51 -0000 To: hdfs-commits@hadoop.apache.org From: eli@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120206085251.4F6D723888FD@eris.apache.org> Author: eli Date: Mon Feb 6 08:52:50 2012 New Revision: 1240928 URL: http://svn.apache.org/viewvc?rev=1240928&view=rev Log: HDFS-2893. The start/stop scripts don't start/stop the 2NN when using the default configuration. Contributed by Eli Collins Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-dfs.sh hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/stop-dfs.sh hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/docs/src/documentation/content/xdocs/hdfs_user_guide.xml Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1240928&r1=1240927&r2=1240928&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Mon Feb 6 08:52:50 2012 @@ -409,6 +409,9 @@ Release 0.23.1 - UNRELEASED HDFS-2889. getNumCurrentReplicas is package private but should be public on 0.23 (see HDFS-2408). (Gregory Chanan via atm) + HDFS-2893. The start/stop scripts don't start/stop the 2NN when + using the default configuration. (eli) + Release 0.23.0 - 2011-11-01 INCOMPATIBLE CHANGES Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-dfs.sh URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-dfs.sh?rev=1240928&r1=1240927&r2=1240928&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-dfs.sh (original) +++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/start-dfs.sh Mon Feb 6 08:52:50 2012 @@ -59,7 +59,7 @@ echo "Starting namenodes on [$NAMENODES] --script "$bin/hdfs" start namenode $nameStartOpt #--------------------------------------------------------- -# datanodes (using defalut slaves file) +# datanodes (using default slaves file) if [ -n "$HADOOP_SECURE_DN_USER" ]; then echo \ @@ -74,22 +74,13 @@ fi #--------------------------------------------------------- # secondary namenodes (if any) -# if there are no secondary namenodes configured it returns -# 0.0.0.0 or empty string SECONDARY_NAMENODES=$($HADOOP_PREFIX/bin/hdfs getconf -secondarynamenodes 2>&-) -SECONDARY_NAMENODES=${SECONDARY_NAMENODES:='0.0.0.0'} -if [ "$SECONDARY_NAMENODES" = '0.0.0.0' ] ; then - echo \ - "Secondary namenodes are not configured. " \ - "Cannot start secondary namenodes." -else - echo "Starting secondary namenodes [$SECONDARY_NAMENODES]" +echo "Starting secondary namenodes [$SECONDARY_NAMENODES]" - "$HADOOP_PREFIX/sbin/hadoop-daemons.sh" \ +"$HADOOP_PREFIX/sbin/hadoop-daemons.sh" \ --config "$HADOOP_CONF_DIR" \ --hostnames "$SECONDARY_NAMENODES" \ --script "$bin/hdfs" start secondarynamenode -fi # eof Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/stop-dfs.sh URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/stop-dfs.sh?rev=1240928&r1=1240927&r2=1240928&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/stop-dfs.sh (original) +++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/bin/stop-dfs.sh Mon Feb 6 08:52:50 2012 @@ -50,22 +50,13 @@ fi #--------------------------------------------------------- # secondary namenodes (if any) -# if there are no secondary namenodes configured it returns -# 0.0.0.0 or empty string SECONDARY_NAMENODES=$($HADOOP_PREFIX/bin/hdfs getconf -secondarynamenodes 2>&-) -SECONDARY_NAMENODES=${SECONDARY_NAMENODES:-'0.0.0.0'} -if [ "$SECONDARY_NAMENODES" = '0.0.0.0' ] ; then - echo \ - "Secondary namenodes are not configured. " \ - "Cannot stop secondary namenodes." -else - echo "Stopping secondary namenodes [$SECONDARY_NAMENODES]" +echo "Stopping secondary namenodes [$SECONDARY_NAMENODES]" - "$HADOOP_PREFIX/sbin/hadoop-daemons.sh" \ +"$HADOOP_PREFIX/sbin/hadoop-daemons.sh" \ --config "$HADOOP_CONF_DIR" \ --hostnames "$SECONDARY_NAMENODES" \ --script "$bin/hdfs" stop secondarynamenode -fi # eof Modified: hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/docs/src/documentation/content/xdocs/hdfs_user_guide.xml URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/docs/src/documentation/content/xdocs/hdfs_user_guide.xml?rev=1240928&r1=1240927&r2=1240928&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/docs/src/documentation/content/xdocs/hdfs_user_guide.xml (original) +++ hadoop/common/trunk/hadoop-hdfs-project/hadoop-hdfs/src/main/docs/src/documentation/content/xdocs/hdfs_user_guide.xml Mon Feb 6 08:52:50 2012 @@ -253,9 +253,7 @@ The secondary NameNode merges the fsimage and the edits log files periodically and keeps edits log size within a limit. It is usually run on a different machine than the primary NameNode since its memory requirements - are on the same order as the primary NameNode. The secondary - NameNode is started by bin/start-dfs.sh on the nodes - specified in conf/masters file. + are on the same order as the primary NameNode.

The start of the checkpoint process on the secondary NameNode is