From 8da3c69b8f3cc5ad1200bfe94831db2860ec11d1 Mon Sep 17 00:00:00 2001 From: chenheng Date: Tue, 22 Sep 2015 16:33:06 +0800 Subject: [PATCH] HBASE-14455 Try to get rid of unused HConnection instance --- .../src/main/java/org/apache/hadoop/hbase/master/HMaster.java | 4 ++-- .../src/main/java/org/apache/hadoop/hbase/master/ServerManager.java | 2 +- 2 files changed, 3 insertions(+), 3 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 7d59c38..75fe759 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 @@ -74,6 +74,7 @@ import org.apache.hadoop.hbase.TableNotDisabledException; import org.apache.hadoop.hbase.TableNotFoundException; import org.apache.hadoop.hbase.UnknownRegionException; 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.Result; 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()); this.serverManager = createServerManager(this, this); - setupClusterConnection(); - // Invalidate all write locks held previously this.tableLockManager.reapWriteLocks(); this.tableStateManager = new TableStateManager(this); @@ -850,6 +849,7 @@ public class HMaster extends HRegionServer implements MasterServices, Server { throws IOException { // We put this out here in a method so can do a Mockito.spy and stub it out // w/ a mocked up ServerManager. + setupClusterConnection(); return new ServerManager(master, services); } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java index 34522a7..9fd67c4 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java @@ -219,7 +219,7 @@ public class ServerManager { Configuration c = master.getConfiguration(); maxSkew = c.getLong("hbase.master.maxclockskew", 30000); 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( "hbase.master.maximum.ping.server.attempts", 10)); int pingSleepInterval = Math.max(1, master.getConfiguration().getInt( -- 1.9.3 (Apple Git-50)