You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2013/03/17 17:55:02 UTC
svn commit: r1457487 -
/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
Author: tedyu
Date: Sun Mar 17 16:55:01 2013
New Revision: 1457487
URL: http://svn.apache.org/r1457487
Log:
HBASE-8130 initialize TableLockManager before initializing AssignmentManager (Rajeshbabu)
Modified:
hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java?rev=1457487&r1=1457486&r2=1457487&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java Sun Mar 17 16:55:01 2013
@@ -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