Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B0999200BCA for ; Mon, 7 Nov 2016 01:54:27 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id AF67D160B0D; Mon, 7 Nov 2016 00:54:27 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 0ABD6160AFC for ; Mon, 7 Nov 2016 01:54:26 +0100 (CET) Received: (qmail 83026 invoked by uid 500); 7 Nov 2016 00:54:14 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 81786 invoked by uid 99); 7 Nov 2016 00:54:13 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Nov 2016 00:54:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5D2AAF16CE; Mon, 7 Nov 2016 00:54:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: fabbri@apache.org To: common-commits@hadoop.apache.org Date: Mon, 07 Nov 2016 00:54:46 -0000 Message-Id: In-Reply-To: <5045bdff33004775a02008351a2cecc2@git.apache.org> References: <5045bdff33004775a02008351a2cecc2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [35/50] [abbrv] hadoop git commit: HADOOP-11088. Quash unnecessary safemode WARN message during NameNode startup. Contributed by Yiqun Lin. archived-at: Mon, 07 Nov 2016 00:54:27 -0000 HADOOP-11088. Quash unnecessary safemode WARN message during NameNode startup. Contributed by Yiqun Lin. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5cad93d5 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5cad93d5 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5cad93d5 Branch: refs/heads/HADOOP-13345 Commit: 5cad93d5c753112931ce97dba966d1ce6b53724b Parents: 7534aee Author: Andrew Wang Authored: Thu Nov 3 15:30:57 2016 -0700 Committer: Andrew Wang Committed: Thu Nov 3 15:31:07 2016 -0700 ---------------------------------------------------------------------- .../hdfs/server/blockmanagement/BlockManagerSafeMode.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/5cad93d5/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManagerSafeMode.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManagerSafeMode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManagerSafeMode.java index a0017a1..ed304f2 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManagerSafeMode.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManagerSafeMode.java @@ -36,6 +36,7 @@ import org.apache.hadoop.net.NetworkTopology; import org.apache.hadoop.util.Daemon; import com.google.common.annotations.VisibleForTesting; +import com.google.common.base.Preconditions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -127,8 +128,8 @@ class BlockManagerSafeMode { this.threshold = conf.getFloat(DFS_NAMENODE_SAFEMODE_THRESHOLD_PCT_KEY, DFS_NAMENODE_SAFEMODE_THRESHOLD_PCT_DEFAULT); if (this.threshold > 1.0) { - LOG.warn("The threshold value should't be greater than 1, threshold: {}", - threshold); + LOG.warn("The threshold value shouldn't be greater than 1, " + + "threshold: {}", threshold); } this.datanodeThreshold = conf.getInt( DFS_NAMENODE_SAFEMODE_MIN_DATANODES_KEY, @@ -171,7 +172,8 @@ class BlockManagerSafeMode { startTime = monotonicNow(); setBlockTotal(total); if (areThresholdsMet()) { - leaveSafeMode(true); + boolean exitResult = leaveSafeMode(false); + Preconditions.checkState(exitResult, "Failed to leave safe mode."); } else { // enter safe mode status = BMSafeModeStatus.PENDING_THRESHOLD; --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org