Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Zhihong Yu 2013-03-17 16:55:01 +00:00
parent 302ce0325b
commit 54c5d944ae
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
View File

@ -691,6 +691,13 @@ Server {
this.serverManager = createServerManager(this, this); 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"); status.setStatus("Initializing ZK system trackers");
initializeZKBasedSystemTrackers(); initializeZKBasedSystemTrackers();
@ -707,13 +714,6 @@ Server {
startServiceThreads(); 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. // Wait for region servers to report in.
this.serverManager.waitForRegionServers(status); this.serverManager.waitForRegionServers(status);
// Check zk for region servers that are up but didn't register // Check zk for region servers that are up but didn't register