diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java index fc4d8f0..a2ba9ea 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java @@ -1874,14 +1874,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) {