From 5e162575ab0c949f4144caf9e546d04f3c587807 Mon Sep 17 00:00:00 2001 From: Pankaj Date: Mon, 3 Dec 2018 14:33:11 +0530 Subject: [PATCH] HBASE-21535, Zombie Master detector is not working --- .../src/main/java/org/apache/hadoop/hbase/master/HMaster.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) 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 ecc9bde..0c0dd5b 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 @@ -895,11 +895,6 @@ public class HMaster extends HRegionServer implements MasterServices { */ private void finishActiveMasterInitialization(MonitoredTask status) throws IOException, InterruptedException, KeeperException, ReplicationException { - Thread zombieDetector = new Thread(new InitializationMonitor(this), - "ActiveMasterInitializationMonitor-" + System.currentTimeMillis()); - zombieDetector.setDaemon(true); - zombieDetector.start(); - /* * We are active master now... go initialize components we need to run. */ @@ -986,6 +981,12 @@ public class HMaster extends HRegionServer implements MasterServices { // Set ourselves as active Master now our claim has succeeded up in zk. this.activeMaster = true; + // Start the Zombie master detector after setting master as active, see HBASE-21535 + Thread zombieDetector = new Thread(new InitializationMonitor(this), + "ActiveMasterInitializationMonitor-" + System.currentTimeMillis()); + zombieDetector.setDaemon(true); + zombieDetector.start(); + // This is for backwards compatibility // See HBASE-11393 status.setStatus("Update TableCFs node in ZNode"); -- 2.7.4