hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ji...@apache.org
Subject hadoop git commit: HDFS-10306. SafeModeMonitor should not leave safe mode if name system is starting active service. Contributed by Mingliang Liu.
Date Tue, 19 Apr 2016 01:05:55 GMT
Repository: hadoop
Updated Branches:
  refs/heads/trunk cb3ca460e -> be0bce1b7


HDFS-10306. SafeModeMonitor should not leave safe mode if name system is starting active service.
Contributed by Mingliang Liu.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/be0bce1b
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/be0bce1b
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/be0bce1b

Branch: refs/heads/trunk
Commit: be0bce1b7171c49e2dca22f56d4e750e606862fc
Parents: cb3ca46
Author: Jing Zhao <jing9@apache.org>
Authored: Mon Apr 18 18:05:49 2016 -0700
Committer: Jing Zhao <jing9@apache.org>
Committed: Mon Apr 18 18:05:49 2016 -0700

----------------------------------------------------------------------
 .../hadoop/hdfs/server/blockmanagement/BlockManagerSafeMode.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/be0bce1b/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 e2d688e..ea70c86 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
@@ -623,7 +623,9 @@ class BlockManagerSafeMode {
      * the extension time has passed.
      */
     private boolean canLeave() {
-      if (timeToLeaveExtension() > 0) {
+      if (namesystem.inTransitionToActive()) {
+        return false;
+      } else if (timeToLeaveExtension() > 0) {
         reportStatus("STATE* Safe mode ON, in safe mode extension.", false);
         return false;
       } else if (!areThresholdsMet()) {


Mime
View raw message