From 54c5d944aecc4c8cfde9fc892b22e8454e3aa0dc Mon Sep 17 00:00:00 2001 From: Zhihong Yu Date: Sun, 17 Mar 2013 16:55:01 +0000 Subject: [PATCH] HBASE-8130 initialize TableLockManager before initializing AssignmentManager (Rajeshbabu) git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1457487 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/hadoop/hbase/master/HMaster.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 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 7ee81a133e6..04125b77635 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 @@ -691,6 +691,13 @@ Server { this.serverManager = createServerManager(this, this); } + //Initialize table lock manager, and ensure that all write locks held previously + //are invalidated + this.tableLockManager = TableLockManager.createTableLockManager(conf, zooKeeper, serverName); + if (!masterRecovery) { + this.tableLockManager.reapAllTableWriteLocks(); + } + status.setStatus("Initializing ZK system trackers"); initializeZKBasedSystemTrackers(); @@ -707,13 +714,6 @@ Server { startServiceThreads(); } - //Initialize table lock manager, and ensure that all write locks held previously - //are invalidated - this.tableLockManager = TableLockManager.createTableLockManager(conf, zooKeeper, serverName); - if (!masterRecovery) { - this.tableLockManager.reapAllTableWriteLocks(); - } - // Wait for region servers to report in. this.serverManager.waitForRegionServers(status); // Check zk for region servers that are up but didn't register