Index: hbase-server/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java (revision 1362329) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java (working copy) @@ -27,8 +27,18 @@ import java.lang.reflect.Proxy; import java.lang.reflect.UndeclaredThrowableException; import java.net.InetSocketAddress; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; +import java.util.Set; +import java.util.TreeMap; import java.util.concurrent.Callable; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CopyOnWriteArraySet; @@ -52,7 +62,10 @@ import org.apache.hadoop.hbase.HServerAddress; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.KeyValue; +import org.apache.hadoop.hbase.MasterAdminProtocol; +import org.apache.hadoop.hbase.MasterMonitorProtocol; import org.apache.hadoop.hbase.MasterNotRunningException; +import org.apache.hadoop.hbase.MasterProtocol; import org.apache.hadoop.hbase.RegionMovedException; import org.apache.hadoop.hbase.RemoteExceptionHandler; import org.apache.hadoop.hbase.ServerName; @@ -65,11 +78,6 @@ import org.apache.hadoop.hbase.ipc.CoprocessorProtocol; import org.apache.hadoop.hbase.ipc.ExecRPCInvoker; import org.apache.hadoop.hbase.ipc.HBaseRPC; -import org.apache.hadoop.hbase.MasterProtocol; -import org.apache.hadoop.hbase.MasterMonitorProtocol; -import org.apache.hadoop.hbase.MasterAdminProtocol; -import org.apache.hadoop.hbase.client.MasterAdminKeepAliveConnection; -import org.apache.hadoop.hbase.client.MasterMonitorKeepAliveConnection; import org.apache.hadoop.hbase.ipc.VersionedProtocol; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.protobuf.RequestConverter; @@ -77,10 +85,15 @@ import org.apache.hadoop.hbase.protobuf.generated.MasterMonitorProtos.GetTableDescriptorsRequest; import org.apache.hadoop.hbase.protobuf.generated.MasterMonitorProtos.GetTableDescriptorsResponse; import org.apache.hadoop.hbase.security.User; -import org.apache.hadoop.hbase.util.*; -import org.apache.hadoop.hbase.zookeeper.ZKClusterId; +import org.apache.hadoop.hbase.util.Addressing; +import org.apache.hadoop.hbase.util.Bytes; +import org.apache.hadoop.hbase.util.Pair; +import org.apache.hadoop.hbase.util.SoftValueSortedMap; +import org.apache.hadoop.hbase.util.Triple; +import org.apache.hadoop.hbase.util.Writables; import org.apache.hadoop.hbase.zookeeper.MasterAddressTracker; import org.apache.hadoop.hbase.zookeeper.RootRegionTracker; +import org.apache.hadoop.hbase.zookeeper.ZKClusterId; import org.apache.hadoop.hbase.zookeeper.ZKTable; import org.apache.hadoop.hbase.zookeeper.ZKUtil; import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; @@ -1615,6 +1628,16 @@ } } + @Override + public MasterAdminProtocol getMasterAdmin() throws MasterNotRunningException { + return getKeepAliveMasterAdmin(); + }; + + @Override + public MasterMonitorProtocol getMasterMonitor() throws MasterNotRunningException { + return getKeepAliveMasterMonitor(); + } + /** * This function allows HBaseAdmin and potentially others * to get a shared MasterAdminProtocol connection. Index: hbase-server/src/main/java/org/apache/hadoop/hbase/client/HConnection.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/client/HConnection.java (revision 1362329) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/client/HConnection.java (working copy) @@ -33,11 +33,11 @@ import org.apache.hadoop.hbase.HRegionLocation; import org.apache.hadoop.hbase.HServerAddress; import org.apache.hadoop.hbase.HTableDescriptor; +import org.apache.hadoop.hbase.MasterAdminProtocol; +import org.apache.hadoop.hbase.MasterMonitorProtocol; import org.apache.hadoop.hbase.MasterNotRunningException; import org.apache.hadoop.hbase.ZooKeeperConnectionException; import org.apache.hadoop.hbase.catalog.CatalogTracker; -import org.apache.hadoop.hbase.client.AdminProtocol; -import org.apache.hadoop.hbase.client.ClientProtocol; import org.apache.hadoop.hbase.client.coprocessor.Batch; import org.apache.hadoop.hbase.ipc.CoprocessorProtocol; import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; @@ -185,6 +185,17 @@ throws IOException; /** + * Returns a {@link MasterAdminProtocol} to the active master + */ + public MasterAdminProtocol getMasterAdmin() throws IOException; + + /** + * Returns an {@link MasterMonitorProtocol} to the active master + */ + public MasterMonitorProtocol getMasterMonitor() throws IOException; + + + /** * Establishes a connection to the region server at the specified address. * @param hostname RegionServer hostname * @param port RegionServer port