Skip to content

Commit b1567f3

Browse files
Apache9Apache9
committed
HBASE-22971 Deprecated RSGroupAdminEndpoint and make RSGroup feature always enabled (#595)
Signed-off-by: Guanghao Zhang <zghao@apache.org>
1 parent 3f1cb10 commit b1567f3

33 files changed

+240
-277
lines changed

‎hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodeLoadBalancer.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,7 @@ private void addRegionToMap(Map<ServerName, List<RegionInfo>> assignmentMapForFa
321321
regionsOnServer.add(region);
322322
}
323323

324+
@Override
324325
public synchronized List<ServerName> getFavoredNodes(RegionInfo regionInfo) {
325326
return this.fnm.getFavoredNodes(regionInfo);
326327
}

‎hbase-server/src/main/java/org/apache/hadoop/hbase/favored/FavoredNodesPromoter.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,6 @@ void generateFavoredNodesForDaughter(List<ServerName> servers,
3535

3636
void generateFavoredNodesForMergedRegion(RegionInfo merged, RegionInfo [] mergeParents)
3737
throws IOException;
38+
39+
List<ServerName> getFavoredNodes(RegionInfo regionInfo);
3840
}

‎hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java‎

Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@
9191
import org.apache.hadoop.hbase.exceptions.DeserializationException;
9292
import org.apache.hadoop.hbase.executor.ExecutorType;
9393
import org.apache.hadoop.hbase.favored.FavoredNodesManager;
94-
import org.apache.hadoop.hbase.favored.FavoredNodesPromoter;
9594
import org.apache.hadoop.hbase.http.InfoServer;
9695
import org.apache.hadoop.hbase.ipc.CoprocessorRpcUtils;
9796
import org.apache.hadoop.hbase.ipc.RpcServer;
@@ -104,7 +103,6 @@
104103
import org.apache.hadoop.hbase.master.assignment.RegionStates;
105104
import org.apache.hadoop.hbase.master.assignment.TransitRegionStateProcedure;
106105
import org.apache.hadoop.hbase.master.balancer.BalancerChore;
107-
import org.apache.hadoop.hbase.master.balancer.BaseLoadBalancer;
108106
import org.apache.hadoop.hbase.master.balancer.ClusterStatusChore;
109107
import org.apache.hadoop.hbase.master.balancer.LoadBalancerFactory;
110108
import org.apache.hadoop.hbase.master.cleaner.DirScanPool;
@@ -185,6 +183,7 @@
185183
import org.apache.hadoop.hbase.replication.master.ReplicationLogCleaner;
186184
import org.apache.hadoop.hbase.replication.master.ReplicationPeerConfigUpgrader;
187185
import org.apache.hadoop.hbase.replication.regionserver.ReplicationStatus;
186+
import org.apache.hadoop.hbase.rsgroup.RSGroupBasedLoadBalancer;
188187
import org.apache.hadoop.hbase.rsgroup.RSGroupInfoManager;
189188
import org.apache.hadoop.hbase.security.AccessDeniedException;
190189
import org.apache.hadoop.hbase.security.SecurityConstants;
@@ -385,7 +384,7 @@ public void run() {
385384

386385
private final LockManager lockManager = new LockManager(this);
387386

388-
private LoadBalancer balancer;
387+
private RSGroupBasedLoadBalancer balancer;
389388
private RegionNormalizer normalizer;
390389
private BalancerChore balancerChore;
391390
private RegionNormalizerChore normalizerChore;
@@ -443,9 +442,6 @@ public void run() {
443442
private long splitPlanCount;
444443
private long mergePlanCount;
445444

446-
/* Handle favored nodes information */
447-
private FavoredNodesManager favoredNodesManager;
448-
449445
/** jetty server for master to redirect requests to regionserver infoServer */
450446
private Server masterJettyServer;
451447

@@ -774,7 +770,8 @@ public MetricsMaster getMasterMetrics() {
774770
@VisibleForTesting
775771
protected void initializeZKBasedSystemTrackers()
776772
throws IOException, InterruptedException, KeeperException, ReplicationException {
777-
this.balancer = LoadBalancerFactory.getLoadBalancer(conf);
773+
this.balancer = new RSGroupBasedLoadBalancer();
774+
this.balancer.setConf(conf);
778775
this.normalizer = RegionNormalizerFactory.getRegionNormalizer(conf);
779776
this.normalizer.setMasterServices(this);
780777
this.normalizer.setMasterRpcServices((MasterRpcServices)rpcServices);
@@ -1014,9 +1011,6 @@ private void finishActiveMasterInitialization(MonitoredTask status) throws IOExc
10141011
return temp;
10151012
});
10161013
}
1017-
if (this.balancer instanceof FavoredNodesPromoter) {
1018-
favoredNodesManager = new FavoredNodesManager(this);
1019-
}
10201014

10211015
// initialize load balancer
10221016
this.balancer.setMasterServices(this);
@@ -1066,11 +1060,11 @@ private void finishActiveMasterInitialization(MonitoredTask status) throws IOExc
10661060
// table states messing up master launch (namespace table, etc., are not assigned).
10671061
this.assignmentManager.processOfflineRegions();
10681062
// Initialize after meta is up as below scans meta
1069-
if (favoredNodesManager != null && !maintenanceMode) {
1063+
if (getFavoredNodesManager() != null && !maintenanceMode) {
10701064
SnapshotOfRegionAssignmentFromMeta snapshotOfRegionAssignment =
10711065
new SnapshotOfRegionAssignmentFromMeta(getConnection());
10721066
snapshotOfRegionAssignment.initialize();
1073-
favoredNodesManager.initialize(snapshotOfRegionAssignment);
1067+
getFavoredNodesManager().initialize(snapshotOfRegionAssignment);
10741068
}
10751069

10761070
// set cluster status again after user regions are assigned
@@ -2024,14 +2018,13 @@ public void move(final byte[] encodedRegionName, byte[] destServerName) throws I
20242018
LOG.debug("Unable to determine a plan to assign " + hri);
20252019
return;
20262020
}
2027-
// TODO: What is this? I don't get it.
2028-
if (dest.equals(serverName) && balancer instanceof BaseLoadBalancer
2029-
&& !((BaseLoadBalancer)balancer).shouldBeOnMaster(hri)) {
2021+
// TODO: deal with table on master for rs group.
2022+
if (dest.equals(serverName)) {
20302023
// To avoid unnecessary region moving later by balancer. Don't put user
20312024
// regions on master.
2032-
LOG.debug("Skipping move of region " + hri.getRegionNameAsString()
2033-
+ " to avoid unnecessary region moving later by load balancer,"
2034-
+ " because it should not be on master");
2025+
LOG.debug("Skipping move of region " + hri.getRegionNameAsString() +
2026+
" to avoid unnecessary region moving later by load balancer," +
2027+
" because it should not be on master");
20352028
return;
20362029
}
20372030
}
@@ -3483,12 +3476,14 @@ public boolean isSplitOrMergeEnabled(MasterSwitchType switchType) {
34833476

34843477
/**
34853478
* Fetch the configured {@link LoadBalancer} class name. If none is set, a default is returned.
3486-
*
3479+
* <p/>
3480+
* Notice that, the base load balancer will always be {@link RSGroupBasedLoadBalancer} now, so
3481+
* this method will return the balancer used inside each rs group.
34873482
* @return The name of the {@link LoadBalancer} in use.
34883483
*/
34893484
public String getLoadBalancerClassName() {
3490-
return conf.get(HConstants.HBASE_MASTER_LOADBALANCER_CLASS, LoadBalancerFactory
3491-
.getDefaultLoadBalancerClass().getName());
3485+
return conf.get(HConstants.HBASE_MASTER_LOADBALANCER_CLASS,
3486+
LoadBalancerFactory.getDefaultLoadBalancerClass().getName());
34923487
}
34933488

34943489
/**
@@ -3503,13 +3498,13 @@ public SplitOrMergeTracker getSplitOrMergeTracker() {
35033498
}
35043499

35053500
@Override
3506-
public LoadBalancer getLoadBalancer() {
3501+
public RSGroupBasedLoadBalancer getLoadBalancer() {
35073502
return balancer;
35083503
}
35093504

35103505
@Override
35113506
public FavoredNodesManager getFavoredNodesManager() {
3512-
return favoredNodesManager;
3507+
return balancer.getFavoredNodesManager();
35133508
}
35143509

35153510
private long executePeerProcedure(AbstractPeerProcedure<?> procedure) throws IOException {
@@ -3843,7 +3838,7 @@ public void runReplicationBarrierCleaner() {
38433838
}
38443839

38453840
@Override
3846-
public RSGroupInfoManager getRSRSGroupInfoManager() {
3841+
public RSGroupInfoManager getRSGroupInfoManager() {
38473842
return rsGroupInfoManager;
38483843
}
38493844
}

‎hbase-server/src/main/java/org/apache/hadoop/hbase/master/LoadBalancer.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,15 @@ public interface LoadBalancer extends Configurable, Stoppable, ConfigurationObse
6464
// We deliberately use 'localhost' so the operation will fail fast
6565
ServerName BOGUS_SERVER_NAME = ServerName.valueOf("localhost,1,1");
6666

67+
/**
68+
* Config for pluggable load balancers.
69+
* @deprecated since 3.0.0, will be removed in 4.0.0. In the new implementation, as the base load
70+
* balancer will always be the rs group based one, you should just use
71+
* {@link org.apache.hadoop.hbase.HConstants#HBASE_MASTER_LOADBALANCER_CLASS} to
72+
* config the per group load balancer.
73+
*/
74+
@Deprecated
75+
String HBASE_RSGROUP_LOADBALANCER_CLASS = "hbase.rsgroup.grouploadbalancer.class";
6776
/**
6877
* Set the current cluster status. This allows a LoadBalancer to map host name to a server
6978
*/

‎hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
import org.apache.hadoop.hbase.master.procedure.MasterProcedureUtil.NonceProcedureRunnable;
7676
import org.apache.hadoop.hbase.master.procedure.ServerCrashProcedure;
7777
import org.apache.hadoop.hbase.mob.MobUtils;
78+
import org.apache.hadoop.hbase.net.Address;
7879
import org.apache.hadoop.hbase.procedure.MasterProcedureManager;
7980
import org.apache.hadoop.hbase.procedure2.LockType;
8081
import org.apache.hadoop.hbase.procedure2.LockedResource;
@@ -221,10 +222,8 @@
221222
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.IsNormalizerEnabledResponse;
222223
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.IsProcedureDoneRequest;
223224
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.IsProcedureDoneResponse;
224-
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos
225-
.IsSnapshotCleanupEnabledRequest;
226-
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos
227-
.IsSnapshotCleanupEnabledResponse;
225+
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.IsSnapshotCleanupEnabledRequest;
226+
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.IsSnapshotCleanupEnabledResponse;
228227
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.IsSnapshotDoneRequest;
229228
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.IsSnapshotDoneResponse;
230229
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.IsSplitOrMergeEnabledRequest;
@@ -278,10 +277,8 @@
278277
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetQuotaRequest;
279278
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetQuotaResponse;
280279
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetRegionStateInMetaRequest;
281-
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos
282-
.SetSnapshotCleanupRequest;
283-
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos
284-
.SetSnapshotCleanupResponse;
280+
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetSnapshotCleanupRequest;
281+
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetSnapshotCleanupResponse;
285282
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetSplitOrMergeEnabledRequest;
286283
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetSplitOrMergeEnabledResponse;
287284
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetTableStateInMetaRequest;
@@ -2407,12 +2404,18 @@ public ClearDeadServersResponse clearDeadServers(RpcController controller,
24072404
LOG.debug("Some dead server is still under processing, won't clear the dead server list");
24082405
response.addAllServerName(request.getServerNameList());
24092406
} else {
2407+
DeadServer deadServer = master.getServerManager().getDeadServers();
2408+
Set<Address> clearedServers = new HashSet<>();
24102409
for (HBaseProtos.ServerName pbServer : request.getServerNameList()) {
2411-
if (!master.getServerManager().getDeadServers()
2412-
.removeDeadServer(ProtobufUtil.toServerName(pbServer))) {
2410+
ServerName server = ProtobufUtil.toServerName(pbServer);
2411+
if (!deadServer.removeDeadServer(server)) {
24132412
response.addServerName(pbServer);
2413+
} else {
2414+
clearedServers.add(server.getAddress());
24142415
}
24152416
}
2417+
master.getRSGroupInfoManager().removeServers(clearedServers);
2418+
LOG.info("Remove decommissioned servers {} from RSGroup done", clearedServers);
24162419
}
24172420

24182421
if (master.cpHost != null) {

‎hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterServices.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -544,5 +544,5 @@ default SplitWALManager getSplitWALManager(){
544544
/**
545545
* @return the {@link RSGroupInfoManager}
546546
*/
547-
RSGroupInfoManager getRSRSGroupInfoManager();
547+
RSGroupInfoManager getRSGroupInfoManager();
548548
}

‎hbase-server/src/main/java/org/apache/hadoop/hbase/master/assignment/AssignmentManager.java‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
import org.apache.hadoop.hbase.procedure2.ProcedureInMemoryChore;
7171
import org.apache.hadoop.hbase.procedure2.util.StringUtils;
7272
import org.apache.hadoop.hbase.regionserver.SequenceId;
73+
import org.apache.hadoop.hbase.rsgroup.RSGroupBasedLoadBalancer;
7374
import org.apache.hadoop.hbase.util.Bytes;
7475
import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
7576
import org.apache.hadoop.hbase.util.HasThread;
@@ -327,6 +328,11 @@ private LoadBalancer getBalancer() {
327328
return master.getLoadBalancer();
328329
}
329330

331+
private FavoredNodesPromoter getFavoredNodePromoter() {
332+
return (FavoredNodesPromoter) ((RSGroupBasedLoadBalancer) master.getLoadBalancer())
333+
.getInternalBalancer();
334+
}
335+
330336
private MasterProcedureEnv getProcedureEnvironment() {
331337
return master.getMasterProcedureExecutor().getEnvironment();
332338
}
@@ -370,7 +376,7 @@ public RegionStateStore getRegionStateStore() {
370376

371377
public List<ServerName> getFavoredNodes(final RegionInfo regionInfo) {
372378
return this.shouldAssignRegionsWithFavoredNodes
373-
? ((FavoredStochasticBalancer) getBalancer()).getFavoredNodes(regionInfo)
379+
? getFavoredNodePromoter().getFavoredNodes(regionInfo)
374380
: ServerName.EMPTY_SERVER_LIST;
375381
}
376382

@@ -1819,8 +1825,8 @@ public void markRegionAsSplit(final RegionInfo parent, final ServerName serverNa
18191825
regionStateStore.splitRegion(parent, daughterA, daughterB, serverName);
18201826
if (shouldAssignFavoredNodes(parent)) {
18211827
List<ServerName> onlineServers = this.master.getServerManager().getOnlineServersList();
1822-
((FavoredNodesPromoter)getBalancer()).
1823-
generateFavoredNodesForDaughter(onlineServers, parent, daughterA, daughterB);
1828+
getFavoredNodePromoter().generateFavoredNodesForDaughter(onlineServers, parent, daughterA,
1829+
daughterB);
18241830
}
18251831
}
18261832

@@ -1845,8 +1851,7 @@ public void markRegionAsMerged(final RegionInfo child, final ServerName serverNa
18451851
}
18461852
regionStateStore.mergeRegions(child, mergeParents, serverName);
18471853
if (shouldAssignFavoredNodes(child)) {
1848-
((FavoredNodesPromoter)getBalancer()).
1849-
generateFavoredNodesForMergedRegion(child, mergeParents);
1854+
getFavoredNodePromoter().generateFavoredNodesForMergedRegion(child, mergeParents);
18501855
}
18511856
}
18521857

‎hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/FavoredStochasticBalancer.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -473,6 +473,7 @@ private List<ServerName> getOnlineFavoredNodes(List<ServerName> onlineServers,
473473
}
474474
}
475475

476+
@Override
476477
public synchronized List<ServerName> getFavoredNodes(RegionInfo regionInfo) {
477478
return this.fnm.getFavoredNodes(regionInfo);
478479
}

‎hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/LoadBalancerFactory.java‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
*/
1818
package org.apache.hadoop.hbase.master.balancer;
1919

20-
import org.apache.yetus.audience.InterfaceAudience;
2120
import org.apache.hadoop.conf.Configuration;
2221
import org.apache.hadoop.hbase.HConstants;
2322
import org.apache.hadoop.hbase.master.LoadBalancer;
24-
import org.apache.hadoop.util.ReflectionUtils;
23+
import org.apache.hadoop.hbase.util.ReflectionUtils;
24+
import org.apache.yetus.audience.InterfaceAudience;
2525

2626
/**
2727
* The class that creates a load balancer from a conf.
@@ -30,8 +30,7 @@
3030
public class LoadBalancerFactory {
3131

3232
/**
33-
* The default {@link LoadBalancer} class.
34-
*
33+
* The default {@link LoadBalancer} class.
3534
* @return The Class for the default {@link LoadBalancer}.
3635
*/
3736
public static Class<? extends LoadBalancer> getDefaultLoadBalancerClass() {
@@ -40,16 +39,15 @@ public static Class<? extends LoadBalancer> getDefaultLoadBalancerClass() {
4039

4140
/**
4241
* Create a loadbalancer from the given conf.
43-
* @param conf
4442
* @return A {@link LoadBalancer}
4543
*/
4644
public static LoadBalancer getLoadBalancer(Configuration conf) {
47-
4845
// Create the balancer
4946
Class<? extends LoadBalancer> balancerKlass =
50-
conf.getClass(HConstants.HBASE_MASTER_LOADBALANCER_CLASS, getDefaultLoadBalancerClass(),
51-
LoadBalancer.class);
52-
return ReflectionUtils.newInstance(balancerKlass, conf);
53-
47+
conf.getClass(HConstants.HBASE_MASTER_LOADBALANCER_CLASS, getDefaultLoadBalancerClass(),
48+
LoadBalancer.class);
49+
LoadBalancer balancer = ReflectionUtils.newInstance(balancerKlass);
50+
balancer.setConf(conf);
51+
return balancer;
5452
}
5553
}

‎hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/AbstractStateMachineNamespaceProcedure.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
package org.apache.hadoop.hbase.master.procedure;
2020

2121
import java.io.IOException;
22+
import java.util.function.Supplier;
2223
import org.apache.hadoop.hbase.NamespaceDescriptor;
2324
import org.apache.hadoop.hbase.TableName;
2425
import org.apache.hadoop.hbase.master.MasterFileSystem;
@@ -28,6 +29,7 @@
2829
import org.apache.hbase.thirdparty.com.google.common.annotations.VisibleForTesting;
2930

3031
import org.apache.hadoop.hbase.procedure2.StateMachineProcedure;
32+
import org.apache.hadoop.hbase.rsgroup.RSGroupInfo;
3133
import org.apache.hadoop.hbase.util.FSUtils;
3234

3335
/**
@@ -122,4 +124,13 @@ public static void createDirectory(MasterFileSystem mfs, NamespaceDescriptor nsD
122124
protected void releaseSyncLatch() {
123125
ProcedurePrepareLatch.releaseLatch(syncLatch, this);
124126
}
127+
128+
protected final void checkNamespaceRSGroup(MasterProcedureEnv env, NamespaceDescriptor nd)
129+
throws IOException {
130+
Supplier<String> forWhom = () -> "namespace " + nd.getName();
131+
RSGroupInfo rsGroupInfo = MasterProcedureUtil.checkGroupExists(
132+
env.getMasterServices().getRSGroupInfoManager()::getRSGroup,
133+
MasterProcedureUtil.getNamespaceGroup(nd), forWhom);
134+
MasterProcedureUtil.checkGroupNotEmpty(rsGroupInfo, forWhom);
135+
}
125136
}

0 commit comments

Comments
 (0)