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 19e05fd..bf08410 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 @@ -208,6 +208,12 @@ implements ServerProcedureInterface { case SERVER_CRASH_GET_REGIONS: // If hbase:meta is not assigned, yield. if (!isMetaAssignedQuickTest(env)) { + // isMetaAssignedQuickTest does not really wait. Let's delay a little before + // another round of execution. + long wait = + env.getMasterConfiguration().getLong(KEY_SHORT_WAIT_ON_META, DEFAULT_SHORT_WAIT_ON_META); + wait = wait/10; + Thread.sleep(wait); throwProcedureYieldException("Waiting on hbase:meta assignment"); } this.regionsOnCrashedServer = @@ -293,6 +299,10 @@ implements ServerProcedureInterface { default: throw new UnsupportedOperationException("unhandled state=" + state); } + } catch (ProcedureYieldException e) { + LOG.warn("Failed serverName=" + this.serverName + ", state=" + state + "; retry " + + e.getMessage()); + throw e; } catch (IOException e) { LOG.warn("Failed serverName=" + this.serverName + ", state=" + state + "; retry", e); } catch (InterruptedException e) {