Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 8D351200B74 for ; Wed, 17 Aug 2016 20:34:13 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 8B9BA160AC1; Wed, 17 Aug 2016 18:34:13 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id BC3A7160AC0 for ; Wed, 17 Aug 2016 20:34:12 +0200 (CEST) Received: (qmail 76332 invoked by uid 500); 17 Aug 2016 18:34:09 -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 73731 invoked by uid 99); 17 Aug 2016 18:34:08 -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; Wed, 17 Aug 2016 18:34:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4F85CE0EB5; Wed, 17 Aug 2016 18:34:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: syuanjiang@apache.org To: commits@hbase.apache.org Date: Wed, 17 Aug 2016 18:34:34 -0000 Message-Id: <4d40df7939b645d5a88403d3f01925db@git.apache.org> In-Reply-To: <24b6f6e47076438098f680eb4b3ad86c@git.apache.org> References: <24b6f6e47076438098f680eb4b3ad86c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [28/50] [abbrv] hbase git commit: HBASE-16367 Race between master and region server initialization may lead to premature server abort - addendum shortens the waiting duration archived-at: Wed, 17 Aug 2016 18:34:13 -0000 HBASE-16367 Race between master and region server initialization may lead to premature server abort - addendum shortens the waiting duration Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1ecb0fce Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1ecb0fce Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1ecb0fce Branch: refs/heads/hbase-12439 Commit: 1ecb0fce342ee878cf96f7a3165007192bedb2ef Parents: 50f3c95 Author: tedyu Authored: Mon Aug 8 10:39:35 2016 -0700 Committer: tedyu Committed: Mon Aug 8 10:39:35 2016 -0700 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hbase/regionserver/HRegionServer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/1ecb0fce/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java index ba5d669..0b4ae75 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java @@ -819,7 +819,7 @@ public class HRegionServer extends HasThread implements blockAndCheckIfStopped(this.clusterStatusTracker); if (this.initLatch != null) { - this.initLatch.await(50, TimeUnit.SECONDS); + this.initLatch.await(20, TimeUnit.SECONDS); } // Retrieve clusterId // Since cluster status is now up