hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject [1/3] hbase git commit: HBASE-19827 Addendum for Flakey TestAssignmentManager Don't clear old location from RTP...
Date Fri, 19 Jan 2018 19:47:39 GMT
Repository: hbase
Updated Branches:
  refs/heads/master 9ba961a5e -> c66b42fd9


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/fa66c7e2
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/fa66c7e2
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/fa66c7e2

Branch: refs/heads/master
Commit: fa66c7e28e886857204dc2ce10f65b5fe264564b
Parents: 9ba961a
Author: Michael Stack <stack@apache.org>
Authored: Fri Jan 19 10:59:47 2018 -0800
Committer: Michael Stack <stack@apache.org>
Committed: Fri Jan 19 10:59:47 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/fa66c7e2/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));
     }
   }


Mime
View raw message