Repository: hbase Updated Branches: refs/heads/master d0aff98a6 -> 3787c60cd
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/master Commit: 3787c60cd143dfed2d5ddb999364e91ee1000799 Parents: d0aff98 Author: Michael Stack <st...@apache.org> Authored: Thu Jan 11 14:37:18 2018 -0800 Committer: Michael Stack <st...@apache.org> 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 { * <li>Handle either fresh cluster start or master failover</li> * </ol> */ - 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);