[hbase] 10/17: HBASE-22971 Deprecated RSGroupAdminEndpoint and make RSGroup feature always enabled (#595)

2020-02-08 Thread zhangduo 
This is an automated email from the ASF dual-hosted git repository.

zhangduo pushed a commit to branch HBASE-22514
in repository https://gitbox.apache.org/repos/asf/hbase.git

commit 89b8b4e1d30e53ed418a9048dde821a2d8d5ec7a
Author: Duo Zhang 
AuthorDate: Tue Sep 24 12:09:12 2019 +0800

HBASE-22971 Deprecated RSGroupAdminEndpoint and make RSGroup feature always 
enabled (#595)

Signed-off-by: Guanghao Zhang 
---
 .../hbase/favored/FavoredNodeLoadBalancer.java |   1 +
 .../hadoop/hbase/favored/FavoredNodesPromoter.java |   2 +
 .../org/apache/hadoop/hbase/master/HMaster.java|  43 +++
 .../apache/hadoop/hbase/master/LoadBalancer.java   |   9 ++
 .../hadoop/hbase/master/MasterRpcServices.java |  23 ++--
 .../apache/hadoop/hbase/master/MasterServices.java |   2 +-
 .../hbase/master/assignment/AssignmentManager.java |  15 ++-
 .../master/balancer/FavoredStochasticBalancer.java |   1 +
 .../hbase/master/balancer/LoadBalancerFactory.java |  18 ++-
 .../AbstractStateMachineNamespaceProcedure.java|  11 ++
 .../master/procedure/CreateNamespaceProcedure.java |   1 +
 .../master/procedure/CreateTableProcedure.java |  27 +++-
 .../master/procedure/MasterProcedureUtil.java  |  50 +++-
 .../master/procedure/ModifyNamespaceProcedure.java |  19 ++-
 .../master/procedure/ModifyTableProcedure.java |  13 +-
 .../hadoop/hbase/rsgroup/RSGroupAdminEndpoint.java | 141 +
 .../hbase/rsgroup/RSGroupBasedLoadBalancer.java|  65 ++
 .../hbase/rsgroup/RSGroupInfoManagerImpl.java  |   2 +-
 .../hadoop/hbase/rsgroup/RSGroupableBalancer.java  |  32 -
 .../org/apache/hadoop/hbase/TestNamespace.java |   2 +-
 .../hadoop/hbase/master/AbstractTestDLS.java   |   4 +-
 .../hbase/master/MockNoopMasterServices.java   |   2 +-
 .../hadoop/hbase/master/TestClusterRestart.java|   6 +-
 .../hadoop/hbase/master/TestMasterMetrics.java |   4 +-
 .../TestMasterRestartAfterDisablingTable.java  |   4 +-
 .../hadoop/hbase/master/TestRollingRestart.java|   2 +-
 .../TestFavoredStochasticBalancerPickers.java  |   2 +-
 .../hadoop/hbase/regionserver/TestRegionOpen.java  |   2 +-
 .../TestRegionReplicasWithRestartScenarios.java|   2 +-
 .../regionserver/TestRegionServerMetrics.java  |   4 +-
 .../hbase/rsgroup/TestRSGroupsOfflineMode.java |   3 +-
 .../security/access/TestTablePermissions.java  |   3 +-
 .../hbase/util/TestHBaseFsckReplication.java   |   2 +
 33 files changed, 240 insertions(+), 277 deletions(-)

diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodeLoadBalancer.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodeLoadBalancer.java
index b8d4b09..52a37a2 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodeLoadBalancer.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodeLoadBalancer.java
@@ -321,6 +321,7 @@ public class FavoredNodeLoadBalancer extends 
BaseLoadBalancer implements Favored
 regionsOnServer.add(region);
   }
 
+  @Override
   public synchronized List getFavoredNodes(RegionInfo regionInfo) {
 return this.fnm.getFavoredNodes(regionInfo);
   }
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodesPromoter.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodesPromoter.java
index 322eb1df..a24fce0 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodesPromoter.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodesPromoter.java
@@ -35,4 +35,6 @@ public interface FavoredNodesPromoter {
 
   void generateFavoredNodesForMergedRegion(RegionInfo merged, RegionInfo [] 
mergeParents)
   throws IOException;
+
+  List getFavoredNodes(RegionInfo regionInfo);
 }
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 6e828e2..07b9fc2 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
@@ -91,7 +91,6 @@ import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;
 import org.apache.hadoop.hbase.exceptions.DeserializationException;
 import org.apache.hadoop.hbase.executor.ExecutorType;
 import org.apache.hadoop.hbase.favored.FavoredNodesManager;
-import org.apache.hadoop.hbase.favored.FavoredNodesPromoter;
 import org.apache.hadoop.hbase.http.InfoServer;
 import org.apache.hadoop.hbase.ipc.CoprocessorRpcUtils;
 import org.apache.hadoop.hbase.ipc.RpcServer;
@@ -104,7 +103,6 @@ import 
org.apache.hadoop.hbase.master.assignment.RegionStateNode;
 import org.apache.hadoop.hbase.master.assignment.RegionStates;
 import org.apache.hadoop.hbase.master.assignment.TransitRegionStateProcedure;
 import org.apache.hadoop.hbase.master.balancer.BalancerChore;
-import

[hbase] 10/17: HBASE-22971 Deprecated RSGroupAdminEndpoint and make RSGroup feature always enabled (#595)

2020-02-07 Thread zhangduo 
This is an automated email from the ASF dual-hosted git repository.

zhangduo pushed a commit to branch HBASE-22514
in repository https://gitbox.apache.org/repos/asf/hbase.git

commit 27dd9ad5fc2280d2e4ca7f1b8a05908c2df10633
Author: Duo Zhang 
AuthorDate: Tue Sep 24 12:09:12 2019 +0800

HBASE-22971 Deprecated RSGroupAdminEndpoint and make RSGroup feature always 
enabled (#595)

Signed-off-by: Guanghao Zhang 
---
 .../hbase/favored/FavoredNodeLoadBalancer.java |   1 +
 .../hadoop/hbase/favored/FavoredNodesPromoter.java |   2 +
 .../org/apache/hadoop/hbase/master/HMaster.java|  43 +++
 .../apache/hadoop/hbase/master/LoadBalancer.java   |   9 ++
 .../hadoop/hbase/master/MasterRpcServices.java |  23 ++--
 .../apache/hadoop/hbase/master/MasterServices.java |   2 +-
 .../hbase/master/assignment/AssignmentManager.java |  15 ++-
 .../master/balancer/FavoredStochasticBalancer.java |   1 +
 .../hbase/master/balancer/LoadBalancerFactory.java |  18 ++-
 .../AbstractStateMachineNamespaceProcedure.java|  11 ++
 .../master/procedure/CreateNamespaceProcedure.java |   1 +
 .../master/procedure/CreateTableProcedure.java |  27 +++-
 .../master/procedure/MasterProcedureUtil.java  |  50 +++-
 .../master/procedure/ModifyNamespaceProcedure.java |  19 ++-
 .../master/procedure/ModifyTableProcedure.java |  13 +-
 .../hadoop/hbase/rsgroup/RSGroupAdminEndpoint.java | 141 +
 .../hbase/rsgroup/RSGroupBasedLoadBalancer.java|  65 ++
 .../hbase/rsgroup/RSGroupInfoManagerImpl.java  |   2 +-
 .../hadoop/hbase/rsgroup/RSGroupableBalancer.java  |  32 -
 .../org/apache/hadoop/hbase/TestNamespace.java |   2 +-
 .../hadoop/hbase/master/AbstractTestDLS.java   |   4 +-
 .../hbase/master/MockNoopMasterServices.java   |   2 +-
 .../hadoop/hbase/master/TestClusterRestart.java|   6 +-
 .../hadoop/hbase/master/TestMasterMetrics.java |   4 +-
 .../TestMasterRestartAfterDisablingTable.java  |   4 +-
 .../hadoop/hbase/master/TestRollingRestart.java|   2 +-
 .../TestFavoredStochasticBalancerPickers.java  |   2 +-
 .../hadoop/hbase/regionserver/TestRegionOpen.java  |   2 +-
 .../TestRegionReplicasWithRestartScenarios.java|   2 +-
 .../regionserver/TestRegionServerMetrics.java  |   4 +-
 .../hbase/rsgroup/TestRSGroupsOfflineMode.java |   3 +-
 .../security/access/TestTablePermissions.java  |   3 +-
 .../hbase/util/TestHBaseFsckReplication.java   |   2 +
 33 files changed, 240 insertions(+), 277 deletions(-)

diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodeLoadBalancer.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodeLoadBalancer.java
index b8d4b09..52a37a2 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodeLoadBalancer.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodeLoadBalancer.java
@@ -321,6 +321,7 @@ public class FavoredNodeLoadBalancer extends 
BaseLoadBalancer implements Favored
 regionsOnServer.add(region);
   }
 
+  @Override
   public synchronized List getFavoredNodes(RegionInfo regionInfo) {
 return this.fnm.getFavoredNodes(regionInfo);
   }
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodesPromoter.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodesPromoter.java
index 322eb1df..a24fce0 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodesPromoter.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodesPromoter.java
@@ -35,4 +35,6 @@ public interface FavoredNodesPromoter {
 
   void generateFavoredNodesForMergedRegion(RegionInfo merged, RegionInfo [] 
mergeParents)
   throws IOException;
+
+  List getFavoredNodes(RegionInfo regionInfo);
 }
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 6e828e2..07b9fc2 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
@@ -91,7 +91,6 @@ import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;
 import org.apache.hadoop.hbase.exceptions.DeserializationException;
 import org.apache.hadoop.hbase.executor.ExecutorType;
 import org.apache.hadoop.hbase.favored.FavoredNodesManager;
-import org.apache.hadoop.hbase.favored.FavoredNodesPromoter;
 import org.apache.hadoop.hbase.http.InfoServer;
 import org.apache.hadoop.hbase.ipc.CoprocessorRpcUtils;
 import org.apache.hadoop.hbase.ipc.RpcServer;
@@ -104,7 +103,6 @@ import 
org.apache.hadoop.hbase.master.assignment.RegionStateNode;
 import org.apache.hadoop.hbase.master.assignment.RegionStates;
 import org.apache.hadoop.hbase.master.assignment.TransitRegionStateProcedure;
 import org.apache.hadoop.hbase.master.balancer.BalancerChore;
-import

[hbase] 10/17: HBASE-22971 Deprecated RSGroupAdminEndpoint and make RSGroup feature always enabled (#595)

2020-02-06 Thread zhangduo 
This is an automated email from the ASF dual-hosted git repository.

zhangduo pushed a commit to branch HBASE-22514
in repository https://gitbox.apache.org/repos/asf/hbase.git

commit 3d5607e877412cfa0c0f27ef1ba4ce7bdb42982f
Author: Duo Zhang 
AuthorDate: Tue Sep 24 12:09:12 2019 +0800

HBASE-22971 Deprecated RSGroupAdminEndpoint and make RSGroup feature always 
enabled (#595)

Signed-off-by: Guanghao Zhang 
---
 .../hbase/favored/FavoredNodeLoadBalancer.java |   1 +
 .../hadoop/hbase/favored/FavoredNodesPromoter.java |   2 +
 .../org/apache/hadoop/hbase/master/HMaster.java|  43 +++
 .../apache/hadoop/hbase/master/LoadBalancer.java   |   9 ++
 .../hadoop/hbase/master/MasterRpcServices.java |  23 ++--
 .../apache/hadoop/hbase/master/MasterServices.java |   2 +-
 .../hbase/master/assignment/AssignmentManager.java |  15 ++-
 .../master/balancer/FavoredStochasticBalancer.java |   1 +
 .../hbase/master/balancer/LoadBalancerFactory.java |  18 ++-
 .../AbstractStateMachineNamespaceProcedure.java|  11 ++
 .../master/procedure/CreateNamespaceProcedure.java |   1 +
 .../master/procedure/CreateTableProcedure.java |  27 +++-
 .../master/procedure/MasterProcedureUtil.java  |  50 +++-
 .../master/procedure/ModifyNamespaceProcedure.java |  19 ++-
 .../master/procedure/ModifyTableProcedure.java |  13 +-
 .../hadoop/hbase/rsgroup/RSGroupAdminEndpoint.java | 141 +
 .../hbase/rsgroup/RSGroupBasedLoadBalancer.java|  65 ++
 .../hbase/rsgroup/RSGroupInfoManagerImpl.java  |   2 +-
 .../hadoop/hbase/rsgroup/RSGroupableBalancer.java  |  32 -
 .../org/apache/hadoop/hbase/TestNamespace.java |   2 +-
 .../hadoop/hbase/master/AbstractTestDLS.java   |   4 +-
 .../hbase/master/MockNoopMasterServices.java   |   2 +-
 .../hadoop/hbase/master/TestClusterRestart.java|   6 +-
 .../hadoop/hbase/master/TestMasterMetrics.java |   4 +-
 .../TestMasterRestartAfterDisablingTable.java  |   4 +-
 .../hadoop/hbase/master/TestRollingRestart.java|   2 +-
 .../TestFavoredStochasticBalancerPickers.java  |   2 +-
 .../hadoop/hbase/regionserver/TestRegionOpen.java  |   2 +-
 .../TestRegionReplicasWithRestartScenarios.java|   2 +-
 .../regionserver/TestRegionServerMetrics.java  |   4 +-
 .../hbase/rsgroup/TestRSGroupsOfflineMode.java |   3 +-
 .../security/access/TestTablePermissions.java  |   3 +-
 .../hbase/util/TestHBaseFsckReplication.java   |   2 +
 33 files changed, 240 insertions(+), 277 deletions(-)

diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodeLoadBalancer.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodeLoadBalancer.java
index b8d4b09..52a37a2 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodeLoadBalancer.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodeLoadBalancer.java
@@ -321,6 +321,7 @@ public class FavoredNodeLoadBalancer extends 
BaseLoadBalancer implements Favored
 regionsOnServer.add(region);
   }
 
+  @Override
   public synchronized List getFavoredNodes(RegionInfo regionInfo) {
 return this.fnm.getFavoredNodes(regionInfo);
   }
diff --git 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodesPromoter.java
 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodesPromoter.java
index 322eb1df..a24fce0 100644
--- 
a/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodesPromoter.java
+++ 
b/hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodesPromoter.java
@@ -35,4 +35,6 @@ public interface FavoredNodesPromoter {
 
   void generateFavoredNodesForMergedRegion(RegionInfo merged, RegionInfo [] 
mergeParents)
   throws IOException;
+
+  List getFavoredNodes(RegionInfo regionInfo);
 }
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 6e828e2..07b9fc2 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
@@ -91,7 +91,6 @@ import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;
 import org.apache.hadoop.hbase.exceptions.DeserializationException;
 import org.apache.hadoop.hbase.executor.ExecutorType;
 import org.apache.hadoop.hbase.favored.FavoredNodesManager;
-import org.apache.hadoop.hbase.favored.FavoredNodesPromoter;
 import org.apache.hadoop.hbase.http.InfoServer;
 import org.apache.hadoop.hbase.ipc.CoprocessorRpcUtils;
 import org.apache.hadoop.hbase.ipc.RpcServer;
@@ -104,7 +103,6 @@ import 
org.apache.hadoop.hbase.master.assignment.RegionStateNode;
 import org.apache.hadoop.hbase.master.assignment.RegionStates;
 import org.apache.hadoop.hbase.master.assignment.TransitRegionStateProcedure;
 import org.apache.hadoop.hbase.master.balancer.BalancerChore;
-import