You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2018/01/19 21:46:51 UTC

hbase git commit: HBASE-19827 Addendum for Flakey TestAssignmentManager Don't clear old location from RTP...

Repository: hbase
Updated Branches:
  refs/heads/master c66b42fd9 -> 579586c69


HBASE-19827 Addendum for Flakey TestAssignmentManager Don't clear old location from RTP...


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

Branch: refs/heads/master
Commit: 579586c6970f63e92e3ca1883f358ce506f14c4a
Parents: c66b42f
Author: Michael Stack <st...@apache.org>
Authored: Fri Jan 19 10:59:47 2018 -0800
Committer: Michael Stack <st...@apache.org>
Committed: Fri Jan 19 13:46:44 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/579586c6/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 e9be058..c18d725 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;
-
-      am.offlineRegion(hri);
+      if (!isDefaultMetaRegion(hri)) {
+        continue;
+      }
       addChildProcedure(new RecoverMetaProcedure(serverName, this.shouldSplitWal));
     }
   }