From 5a37c98a29938d5e8d5b723ff3abb39179b69e38 Mon Sep 17 00:00:00 2001 From: Duo Zhang Date: Tue, 10 Sep 2019 11:13:50 +0800 Subject: [PATCH] Revert "HBASE-22729 Start RSGroupInfoManager as default (#555)" This reverts commit 58dee3ea5bdbab714ac38f1bb73a612f06b8d948. --- .../java/org/apache/hadoop/hbase/master/HMaster.java | 10 ---------- .../org/apache/hadoop/hbase/master/MasterServices.java | 7 ++----- .../hadoop/hbase/rsgroup/RSGroupAdminEndpoint.java | 2 +- .../hadoop/hbase/rsgroup/RSGroupInfoManager.java | 5 ----- .../hadoop/hbase/master/MockNoopMasterServices.java | 6 ------ 5 files changed, 3 insertions(+), 27 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 cab3a64004c..79ed2607e07 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 @@ -186,7 +186,6 @@ import org.apache.hadoop.hbase.replication.master.ReplicationHFileCleaner; import org.apache.hadoop.hbase.replication.master.ReplicationLogCleaner; import org.apache.hadoop.hbase.replication.master.ReplicationPeerConfigUpgrader; import org.apache.hadoop.hbase.replication.regionserver.ReplicationStatus; -import org.apache.hadoop.hbase.rsgroup.RSGroupInfoManager; import org.apache.hadoop.hbase.security.AccessDeniedException; import org.apache.hadoop.hbase.security.SecurityConstants; import org.apache.hadoop.hbase.security.UserProvider; @@ -351,8 +350,6 @@ public class HMaster extends HRegionServer implements MasterServices { // manager of assignment nodes in zookeeper private AssignmentManager assignmentManager; - private RSGroupInfoManager rsGroupInfoManager; - // manager of replication private ReplicationPeerManager replicationPeerManager; @@ -775,8 +772,6 @@ public class HMaster extends HRegionServer implements MasterServices { this.splitOrMergeTracker = new SplitOrMergeTracker(zooKeeper, conf, this); this.splitOrMergeTracker.start(); - this.rsGroupInfoManager = RSGroupInfoManager.create(this); - this.replicationPeerManager = ReplicationPeerManager.create(zooKeeper, conf); this.drainingServerTracker = new DrainingServerTracker(zooKeeper, this, this.serverManager); @@ -3756,9 +3751,4 @@ public class HMaster extends HRegionServer implements MasterServices { public HbckChore getHbckChore() { return this.hbckChore; } - - @Override - public RSGroupInfoManager getRSRSGroupInfoManager() { - return rsGroupInfoManager; - } } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterServices.java index ead40b989d8..41cec5cfb23 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterServices.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterServices.java @@ -18,8 +18,10 @@ package org.apache.hadoop.hbase.master; import com.google.protobuf.Service; + import java.io.IOException; import java.util.List; + import org.apache.hadoop.hbase.Server; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.TableDescriptors; @@ -49,7 +51,6 @@ import org.apache.hadoop.hbase.replication.ReplicationException; import org.apache.hadoop.hbase.replication.ReplicationPeerConfig; import org.apache.hadoop.hbase.replication.ReplicationPeerDescription; import org.apache.hadoop.hbase.replication.SyncReplicationState; -import org.apache.hadoop.hbase.rsgroup.RSGroupInfoManager; import org.apache.hadoop.hbase.security.access.AccessChecker; import org.apache.hadoop.hbase.security.access.ZKPermissionWatcher; import org.apache.yetus.audience.InterfaceAudience; @@ -536,8 +537,4 @@ public interface MasterServices extends Server { */ List executeRegionPlansWithThrottling(List plans); - /** - * @return the {@link RSGroupInfoManager} - */ - RSGroupInfoManager getRSRSGroupInfoManager(); } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupAdminEndpoint.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupAdminEndpoint.java index 0bde67b7759..a2a5623bfa1 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupAdminEndpoint.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupAdminEndpoint.java @@ -66,7 +66,7 @@ public class RSGroupAdminEndpoint implements MasterCoprocessor, MasterObserver { } master = ((HasMasterServices) env).getMasterServices(); - groupInfoManager = master.getRSRSGroupInfoManager(); + groupInfoManager = RSGroupInfoManagerImpl.getInstance(master); groupAdminServer = new RSGroupAdminServer(master, groupInfoManager); Class clazz = master.getConfiguration().getClass(HConstants.HBASE_MASTER_LOADBALANCER_CLASS, null); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManager.java index a46fa4bcb1a..1b9f3efef56 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupInfoManager.java @@ -21,7 +21,6 @@ import java.io.IOException; import java.util.List; import java.util.Set; import org.apache.hadoop.hbase.TableName; -import org.apache.hadoop.hbase.master.MasterServices; import org.apache.hadoop.hbase.net.Address; import org.apache.yetus.audience.InterfaceAudience; @@ -88,8 +87,4 @@ public interface RSGroupInfoManager { */ @Deprecated RSGroupInfo getRSGroupForTable(TableName tableName) throws IOException; - - static RSGroupInfoManager create(MasterServices master) throws IOException { - return RSGroupInfoManagerImpl.getInstance(master); - } } diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockNoopMasterServices.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockNoopMasterServices.java index 26772ae9423..cbfdd3f7449 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockNoopMasterServices.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockNoopMasterServices.java @@ -54,7 +54,6 @@ import org.apache.hadoop.hbase.replication.ReplicationException; import org.apache.hadoop.hbase.replication.ReplicationPeerConfig; import org.apache.hadoop.hbase.replication.ReplicationPeerDescription; import org.apache.hadoop.hbase.replication.SyncReplicationState; -import org.apache.hadoop.hbase.rsgroup.RSGroupInfoManager; import org.apache.hadoop.hbase.security.access.AccessChecker; import org.apache.hadoop.hbase.security.access.ZKPermissionWatcher; import org.apache.hadoop.hbase.zookeeper.ZKWatcher; @@ -491,9 +490,4 @@ public class MockNoopMasterServices implements MasterServices { public AsyncClusterConnection getAsyncClusterConnection() { return null; } - - @Override - public RSGroupInfoManager getRSRSGroupInfoManager() { - return null; - } } \ No newline at end of file