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:
parent
302ce0325b
commit
54c5d944ae
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue