hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject [3/3] hbase git commit: Revert "HBASE-19827 Addendum for Flakey TestAssignmentManager" Premature commit.
Date Fri, 19 Jan 2018 19:47:41 GMT
Revert "HBASE-19827 Addendum for Flakey TestAssignmentManager"
Premature commit.

This reverts commit fa66c7e28e886857204dc2ce10f65b5fe264564b.


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

Branch: refs/heads/master
Commit: c66b42fd9d1e4336352edf6851e4caa2ce0295d1
Parents: 298dc0c
Author: Michael Stack <stack@apache.org>
Authored: Fri Jan 19 11:47:28 2018 -0800
Committer: Michael Stack <stack@apache.org>
Committed: Fri Jan 19 11:47:28 2018 -0800

----------------------------------------------------------------------
 .../hadoop/hbase/master/procedure/ServerCrashProcedure.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/c66b42fd/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ServerCrashProcedure.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ServerCrashProcedure.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ServerCrashProcedure.java
index c18d725..e9be058 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ServerCrashProcedure.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ServerCrashProcedure.java
@@ -195,9 +195,9 @@ implements ServerProcedureInterface {
     // Assign meta if still carrying it. Check again: region may be assigned because of RIT
timeout
     final AssignmentManager am = env.getMasterServices().getAssignmentManager();
     for (RegionInfo hri: am.getRegionStates().getServerRegionInfoSet(serverName)) {
-      if (!isDefaultMetaRegion(hri)) {
-        continue;
-      }
+      if (!isDefaultMetaRegion(hri)) continue;
+
+      am.offlineRegion(hri);
       addChildProcedure(new RecoverMetaProcedure(serverName, this.shouldSplitWal));
     }
   }


Mime
View raw message