From commits-return-65466-archive-asf-public=cust-asf.ponee.io@hbase.apache.org Mon Jan 15 08:41:05 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id E746D18066D for ; Mon, 15 Jan 2018 08:41:04 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id D78FC160C25; Mon, 15 Jan 2018 07:41:04 +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 1D47F160C31 for ; Mon, 15 Jan 2018 08:41:03 +0100 (CET) Received: (qmail 23614 invoked by uid 500); 15 Jan 2018 07:41: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 22890 invoked by uid 99); 15 Jan 2018 07:41: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, 15 Jan 2018 07:41:02 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 15EC6EEE38; Mon, 15 Jan 2018 07:41:01 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: zhangduo@apache.org To: commits@hbase.apache.org Date: Mon, 15 Jan 2018 07:41:12 -0000 Message-Id: <6db47a2d63f944baac2962d95b23be11@git.apache.org> In-Reply-To: <98de805ebc0248908f008abe43a42be9@git.apache.org> References: <98de805ebc0248908f008abe43a42be9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [13/27] hbase git commit: HBASE-19694 The initialization order for a fresh cluster is incorrect; ADDENDUM Fix compile issue. HBASE-19694 The initialization order for a fresh cluster is incorrect; ADDENDUM Fix compile issue. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/3787c60c Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/3787c60c Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/3787c60c Branch: refs/heads/HBASE-19064 Commit: 3787c60cd143dfed2d5ddb999364e91ee1000799 Parents: d0aff98 Author: Michael Stack Authored: Thu Jan 11 14:37:18 2018 -0800 Committer: Michael Stack Committed: Thu Jan 11 14:37:18 2018 -0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/hbase/master/HMaster.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/3787c60c/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java index c550244..c3d51fa 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java @@ -771,8 +771,8 @@ public class HMaster extends HRegionServer implements MasterServices { *
  • Handle either fresh cluster start or master failover
    • * */ - private void finishActiveMasterInitialization(MonitoredTask status) - throws IOException, InterruptedException, KeeperException, CoordinatedStateException { + private void finishActiveMasterInitialization(MonitoredTask status) throws IOException, + InterruptedException, KeeperException, CoordinatedStateException, ReplicationException { Thread zombieDetector = new Thread(new InitializationMonitor(this), "ActiveMasterInitializationMonitor-" + System.currentTimeMillis()); zombieDetector.setDaemon(true);