From hdfs-commits-return-4617-apmail-hadoop-hdfs-commits-archive=hadoop.apache.org@hadoop.apache.org Thu Oct 11 00:35:44 2012 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 E6A2ED39D for ; Thu, 11 Oct 2012 00:35:43 +0000 (UTC) Received: (qmail 85115 invoked by uid 500); 11 Oct 2012 00:35:43 -0000 Delivered-To: apmail-hadoop-hdfs-commits-archive@hadoop.apache.org Received: (qmail 85062 invoked by uid 500); 11 Oct 2012 00:35:43 -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 85050 invoked by uid 99); 11 Oct 2012 00:35:43 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Oct 2012 00:35:43 +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; Thu, 11 Oct 2012 00:35:42 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 83078238896F; Thu, 11 Oct 2012 00:34:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1396882 - in /hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs: CHANGES.txt src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java Date: Thu, 11 Oct 2012 00:34:59 -0000 To: hdfs-commits@hadoop.apache.org From: atm@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121011003459.83078238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: atm Date: Thu Oct 11 00:34:58 2012 New Revision: 1396882 URL: http://svn.apache.org/viewvc?rev=1396882&view=rev Log: HDFS-4021. Misleading error message when resources are low on the NameNode. Contributed by Christopher Conner. Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt?rev=1396882&r1=1396881&r2=1396882&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt (original) +++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt Thu Oct 11 00:34:58 2012 @@ -88,6 +88,9 @@ Release 2.0.3-alpha - Unreleased HDFS-4020. TestRBWBlockInvalidation may time out. (eli) + HDFS-4021. Misleading error message when resources are low on the NameNode. + (Christopher Conner via atm) + Release 2.0.2-alpha - 2012-09-07 INCOMPATIBLE CHANGES Modified: hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java?rev=1396882&r1=1396881&r2=1396882&view=diff ============================================================================== --- hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java (original) +++ hadoop/common/branches/branch-2/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java Thu Oct 11 00:34:58 2012 @@ -4044,7 +4044,10 @@ public class FSNamesystem implements Nam return "Safe mode is OFF."; String leaveMsg = ""; if (areResourcesLow()) { - leaveMsg = "Resources are low on NN. Safe mode must be turned off manually"; + leaveMsg = "Resources are low on NN. " + + "Please add or free up more resources then turn off safe mode manually. " + + "NOTE: If you turn off safe mode before adding resources, " + + "the NN will immediately return to safe mode."; } else { leaveMsg = "Safe mode will be turned off automatically"; }