Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A06E718708 for ; Mon, 11 Apr 2016 00:10:02 +0000 (UTC) Received: (qmail 38181 invoked by uid 500); 11 Apr 2016 00:10:02 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 38132 invoked by uid 500); 11 Apr 2016 00:10:02 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 38123 invoked by uid 99); 11 Apr 2016 00:10:02 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Apr 2016 00:10:02 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2C58CDFC55; Mon, 11 Apr 2016 00:10:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jerryjch@apache.org To: commits@hbase.apache.org Message-Id: <285bbe4caffb47969fc8c63693f9e1fa@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-15591 ServerCrashProcedure not yielding Date: Mon, 11 Apr 2016 00:10:02 +0000 (UTC) Repository: hbase Updated Branches: refs/heads/branch-1 7303c7e47 -> ff835d5ae 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/ff835d5a Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ff835d5a Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ff835d5a Branch: refs/heads/branch-1 Commit: ff835d5ae66da954f3a05f8cdcd80539396a694b Parents: 7303c7e Author: Jerry He Authored: Sun Apr 10 17:02:39 2016 -0700 Committer: Jerry He Committed: Sun Apr 10 17:07: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/ff835d5a/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 0e35ddb..90addb2 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 @@ -173,7 +173,7 @@ implements ServerProcedureInterface { @Override protected Flow executeFromState(MasterProcedureEnv env, ServerCrashState state) - throws ProcedureYieldException { + throws ProcedureYieldException { if (LOG.isTraceEnabled()) { LOG.trace(state); } @@ -209,10 +209,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) { @@ -292,8 +299,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) {