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

HBASE-14455 Try to get rid of unused HConnection instance

Browse Source 
Signed-off-by: stack <stack@apache.org>
This commit is contained in:
chenheng 2015-09-22 16:33:06 +08:00 committed by stack
parent b6bd811c76
commit 487f741721
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,6 +74,7 @@ import org.apache.hadoop.hbase.TableNotDisabledException;
import org.apache.hadoop.hbase.TableNotFoundException; import org.apache.hadoop.hbase.TableNotFoundException;
import org.apache.hadoop.hbase.UnknownRegionException; import org.apache.hadoop.hbase.UnknownRegionException;
import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceAudience;
import org.apache.hadoop.hbase.client.ClusterConnection;
import org.apache.hadoop.hbase.client.RegionReplicaUtil; import org.apache.hadoop.hbase.client.RegionReplicaUtil;
import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.client.TableState; import org.apache.hadoop.hbase.client.TableState;
@ -660,8 +661,6 @@ public class HMaster extends HRegionServer implements MasterServices, Server {
ZKClusterId.setClusterId(this.zooKeeper, fileSystemManager.getClusterId()); ZKClusterId.setClusterId(this.zooKeeper, fileSystemManager.getClusterId());
this.serverManager = createServerManager(this, this); this.serverManager = createServerManager(this, this);
setupClusterConnection();
// Invalidate all write locks held previously // Invalidate all write locks held previously
this.tableLockManager.reapWriteLocks(); this.tableLockManager.reapWriteLocks();
this.tableStateManager = new TableStateManager(this); this.tableStateManager = new TableStateManager(this);
@ -850,6 +849,7 @@ public class HMaster extends HRegionServer implements MasterServices, Server {
throws IOException { throws IOException {
// We put this out here in a method so can do a Mockito.spy and stub it out // We put this out here in a method so can do a Mockito.spy and stub it out
// w/ a mocked up ServerManager. // w/ a mocked up ServerManager.
setupClusterConnection();
return new ServerManager(master, services); return new ServerManager(master, services);
} }

2
hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java
View File

@ -219,7 +219,7 @@ public class ServerManager {
Configuration c = master.getConfiguration(); Configuration c = master.getConfiguration();
maxSkew = c.getLong("hbase.master.maxclockskew", 30000); maxSkew = c.getLong("hbase.master.maxclockskew", 30000);
warningSkew = c.getLong("hbase.master.warningclockskew", 10000); warningSkew = c.getLong("hbase.master.warningclockskew", 10000);
this.connection = connect ? (ClusterConnection)ConnectionFactory.createConnection(c) : null; this.connection = connect ? master.getConnection() : null;
int pingMaxAttempts = Math.max(1, master.getConfiguration().getInt( int pingMaxAttempts = Math.max(1, master.getConfiguration().getInt(
"hbase.master.maximum.ping.server.attempts", 10)); "hbase.master.maximum.ping.server.attempts", 10));
int pingSleepInterval = Math.max(1, master.getConfiguration().getInt( int pingSleepInterval = Math.max(1, master.getConfiguration().getInt(