HBASE-15591 ServerCrashProcedure not yielding
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/80df1cb7 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/80df1cb7 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/80df1cb7 Branch: refs/heads/hbase-12439 Commit: 80df1cb7b6c3eaae20c3f1390e60f1d35be004b9 Parents: f7d44e9 Author: Jerry He <jerry...@apache.org> Authored: Sun Apr 10 17:02:39 2016 -0700 Committer: Jerry He <jerry...@apache.org> Committed: Sun Apr 10 17:02:39 2016 -0700 ---------------------------------------------------------------------- .../master/procedure/ServerCrashProcedure.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/80df1cb7/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 19e05fd..7de694c 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 @@ -172,7 +172,7 @@ implements ServerProcedureInterface { @Override protected Flow executeFromState(MasterProcedureEnv env, ServerCrashState state) - throws ProcedureYieldException { + throws ProcedureYieldException { if (LOG.isTraceEnabled()) { LOG.trace(state); } @@ -208,10 +208,17 @@ 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 = - services.getAssignmentManager().getRegionStates().getServerRegions(this.serverName); + services.getAssignmentManager().getRegionStates().getServerRegions(this.serverName); // Where to go next? Depends on whether we should split logs at all or if we should do // distributed log splitting (DLS) vs distributed log replay (DLR). if (!this.shouldSplitWal) { @@ -291,8 +298,12 @@ implements ServerProcedureInterface { return Flow.NO_MORE_STATE; default: - throw new UnsupportedOperationException("unhandled state=" + state); + 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) {
