hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject hbase git commit: HBASE-14013 Retry when RegionServerNotYetRunningException rather than go ahead with assign so for sure we don't skip WAL replay
Date Thu, 02 Jul 2015 21:40:11 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1.2 913d0c726 -> 9c13d8eee


HBASE-14013 Retry when RegionServerNotYetRunningException rather than go ahead with assign
so for sure we don't skip WAL replay


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

Branch: refs/heads/branch-1.2
Commit: 9c13d8eee4b722fed66511b41025bc5794cdae00
Parents: 913d0c7
Author: stack <stack@apache.org>
Authored: Thu Jul 2 14:39:46 2015 -0700
Committer: stack <stack@apache.org>
Committed: Thu Jul 2 14:39:46 2015 -0700

----------------------------------------------------------------------
 .../java/org/apache/hadoop/hbase/master/AssignmentManager.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/9c13d8ee/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
index 6dd5997..7d9c5a0 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
@@ -1870,14 +1870,14 @@ public class AssignmentManager extends ZooKeeperListener {
         }
         boolean logRetries = true;
         if (t instanceof RegionServerAbortedException
-            || t instanceof RegionServerStoppedException) {
+            || t instanceof RegionServerStoppedException
+            || t instanceof ServerNotRunningYetException) {
           // RS is aborting or stopping, we cannot offline the region since the region may
need
           // to do WAL recovery. Until we see  the RS expiration, we should retry.
           sleepTime = 1 + conf.getInt(RpcClient.FAILED_SERVER_EXPIRY_KEY,
             RpcClient.FAILED_SERVER_EXPIRY_DEFAULT);
 
-        } else if (t instanceof NotServingRegionException
-            || t instanceof ServerNotRunningYetException) {
+        } else if (t instanceof NotServingRegionException) {
           LOG.debug("Offline " + region.getRegionNameAsString()
             + ", it's not any more on " + server, t);
           if (transitionInZK) {


Mime
View raw message