From 8078e16015f2e8ec4fe1abedcadd23a4494d8505 Mon Sep 17 00:00:00 2001 From: Aaron Myers Date: Thu, 11 Oct 2012 00:32:46 +0000 Subject: [PATCH] HDFS-4021. Misleading error message when resources are low on the NameNode. Contributed by Christopher Conner. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1396881 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 38ede68fe7..012ece743d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -316,6 +316,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 diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java index 568fc33540..36cde19722 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java @@ -4059,7 +4059,10 @@ String getTurnOffTip() { 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"; }