Skip to content

Commit 38fe1b0

Browse files
Apache9Apache9
committed
HBASE-22971 Deprecated RSGroupAdminEndpoint and make RSGroup feature always enabled
1 parent 961e89b commit 38fe1b0

31 files changed

+238
-276
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
@@ -90,7 +90,6 @@
9090
import org.apache.hadoop.hbase.exceptions.DeserializationException;
9191
import org.apache.hadoop.hbase.executor.ExecutorType;
9292
import org.apache.hadoop.hbase.favored.FavoredNodesManager;
93-
import org.apache.hadoop.hbase.favored.FavoredNodesPromoter;
9493
import org.apache.hadoop.hbase.http.InfoServer;
9594
import org.apache.hadoop.hbase.ipc.CoprocessorRpcUtils;
9695
import org.apache.hadoop.hbase.ipc.RpcServer;
@@ -106,7 +105,6 @@
106105
import org.apache.hadoop.hbase.master.assignment.TransitRegionStateProcedure;
107106
import org.apache.hadoop.hbase.master.assignment.UnassignProcedure;
108107
import org.apache.hadoop.hbase.master.balancer.BalancerChore;
109-
import org.apache.hadoop.hbase.master.balancer.BaseLoadBalancer;
110108
import org.apache.hadoop.hbase.master.balancer.ClusterStatusChore;
111109
import org.apache.hadoop.hbase.master.balancer.LoadBalancerFactory;
112110
import org.apache.hadoop.hbase.master.cleaner.DirScanPool;
@@ -186,6 +184,7 @@
186184
import org.apache.hadoop.hbase.replication.master.ReplicationLogCleaner;
187185
import org.apache.hadoop.hbase.replication.master.ReplicationPeerConfigUpgrader;
188186
import org.apache.hadoop.hbase.replication.regionserver.ReplicationStatus;
187+
import org.apache.hadoop.hbase.rsgroup.RSGroupBasedLoadBalancer;
189188
import org.apache.hadoop.hbase.rsgroup.RSGroupInfoManager;
190189
import org.apache.hadoop.hbase.security.AccessDeniedException;
191190
import org.apache.hadoop.hbase.security.SecurityConstants;
@@ -383,7 +382,7 @@ public void run() {
383382

384383
private final LockManager lockManager = new LockManager(this);
385384

386-
private LoadBalancer balancer;
385+
private RSGroupBasedLoadBalancer balancer;
387386
private RegionNormalizer normalizer;
388387
private BalancerChore balancerChore;
389388
private RegionNormalizerChore normalizerChore;
@@ -438,9 +437,6 @@ public void run() {
438437
private long splitPlanCount;
439438
private long mergePlanCount;
440439

441-
/* Handle favored nodes information */
442-
private FavoredNodesManager favoredNodesManager;
443-
444440
/** jetty server for master to redirect requests to regionserver infoServer */
445441
private Server masterJettyServer;
446442

@@ -765,7 +761,8 @@ public MetricsMaster getMasterMetrics() {
765761
@VisibleForTesting
766762
protected void initializeZKBasedSystemTrackers()
767763
throws IOException, InterruptedException, KeeperException, ReplicationException {
768-
this.balancer = LoadBalancerFactory.getLoadBalancer(conf);
764+
this.balancer = new RSGroupBasedLoadBalancer();
765+
this.balancer.setConf(conf);
769766
this.normalizer = RegionNormalizerFactory.getRegionNormalizer(conf);
770767
this.normalizer.setMasterServices(this);
771768
this.normalizer.setMasterRpcServices((MasterRpcServices)rpcServices);
@@ -1049,9 +1046,6 @@ private void finishActiveMasterInitialization(MonitoredTask status) throws IOExc
10491046
return temp;
10501047
});
10511048
}
1052-
if (this.balancer instanceof FavoredNodesPromoter) {
1053-
favoredNodesManager = new FavoredNodesManager(this);
1054-
}
10551049

10561050
// initialize load balancer
10571051
this.balancer.setMasterServices(this);
@@ -1101,11 +1095,11 @@ private void finishActiveMasterInitialization(MonitoredTask status) throws IOExc
11011095
// table states messing up master launch (namespace table, etc., are not assigned).
11021096
this.assignmentManager.processOfflineRegions();
11031097
// Initialize after meta is up as below scans meta
1104-
if (favoredNodesManager != null && !maintenanceMode) {
1098+
if (getFavoredNodesManager() != null && !maintenanceMode) {
11051099
SnapshotOfRegionAssignmentFromMeta snapshotOfRegionAssignment =
11061100
new SnapshotOfRegionAssignmentFromMeta(getConnection());
11071101
snapshotOfRegionAssignment.initialize();
1108-
favoredNodesManager.initialize(snapshotOfRegionAssignment);
1102+
getFavoredNodesManager().initialize(snapshotOfRegionAssignment);
11091103
}
11101104

11111105
// set cluster status again after user regions are assigned
@@ -2042,14 +2036,13 @@ public void move(final byte[] encodedRegionName, byte[] destServerName) throws I
20422036
LOG.debug("Unable to determine a plan to assign " + hri);
20432037
return;
20442038
}
2045-
// TODO: What is this? I don't get it.
2046-
if (dest.equals(serverName) && balancer instanceof BaseLoadBalancer
2047-
&& !((BaseLoadBalancer)balancer).shouldBeOnMaster(hri)) {
2039+
// TODO: deal with table on master for rs group.
2040+
if (dest.equals(serverName)) {
20482041
// To avoid unnecessary region moving later by balancer. Don't put user
20492042
// regions on master.
2050-
LOG.debug("Skipping move of region " + hri.getRegionNameAsString()
2051-
+ " to avoid unnecessary region moving later by load balancer,"
2052-
+ " because it should not be on master");
2043+
LOG.debug("Skipping move of region " + hri.getRegionNameAsString() +
2044+
" to avoid unnecessary region moving later by load balancer," +
2045+
" because it should not be on master");
20532046
return;
20542047
}
20552048
}
@@ -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 {
@@ -3795,7 +3790,7 @@ public HbckChore getHbckChore() {
37953790
}
37963791

37973792
@Override
3798-
public RSGroupInfoManager getRSRSGroupInfoManager() {
3793+
public RSGroupInfoManager getRSGroupInfoManager() {
37993794
return rsGroupInfoManager;
38003795
}
38013796
}

‎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
@@ -74,6 +74,7 @@
7474
import org.apache.hadoop.hbase.master.procedure.MasterProcedureUtil.NonceProcedureRunnable;
7575
import org.apache.hadoop.hbase.master.procedure.ServerCrashProcedure;
7676
import org.apache.hadoop.hbase.mob.MobUtils;
77+
import org.apache.hadoop.hbase.net.Address;
7778
import org.apache.hadoop.hbase.procedure.MasterProcedureManager;
7879
import org.apache.hadoop.hbase.procedure2.LockType;
7980
import org.apache.hadoop.hbase.procedure2.LockedResource;
@@ -219,10 +220,8 @@
219220
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.IsNormalizerEnabledResponse;
220221
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.IsProcedureDoneRequest;
221222
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.IsProcedureDoneResponse;
222-
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos
223-
.IsSnapshotCleanupEnabledRequest;
224-
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos
225-
.IsSnapshotCleanupEnabledResponse;
223+
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.IsSnapshotCleanupEnabledRequest;
224+
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.IsSnapshotCleanupEnabledResponse;
226225
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.IsSnapshotDoneRequest;
227226
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.IsSnapshotDoneResponse;
228227
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.IsSplitOrMergeEnabledRequest;
@@ -275,10 +274,8 @@
275274
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetNormalizerRunningResponse;
276275
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetQuotaRequest;
277276
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetQuotaResponse;
278-
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos
279-
.SetSnapshotCleanupRequest;
280-
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos
281-
.SetSnapshotCleanupResponse;
277+
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetSnapshotCleanupRequest;
278+
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetSnapshotCleanupResponse;
282279
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetSplitOrMergeEnabledRequest;
283280
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetSplitOrMergeEnabledResponse;
284281
import org.apache.hadoop.hbase.shaded.protobuf.generated.MasterProtos.SetTableStateInMetaRequest;
@@ -2380,12 +2377,18 @@ public ClearDeadServersResponse clearDeadServers(RpcController controller,
23802377
LOG.debug("Some dead server is still under processing, won't clear the dead server list");
23812378
response.addAllServerName(request.getServerNameList());
23822379
} else {
2380+
DeadServer deadServer = master.getServerManager().getDeadServers();
2381+
Set<Address> clearedServers = new HashSet<>();
23832382
for (HBaseProtos.ServerName pbServer : request.getServerNameList()) {
2384-
if (!master.getServerManager().getDeadServers()
2385-
.removeDeadServer(ProtobufUtil.toServerName(pbServer))) {
2383+
ServerName server = ProtobufUtil.toServerName(pbServer);
2384+
if (!deadServer.removeDeadServer(server)) {
23862385
response.addServerName(pbServer);
2386+
} else {
2387+
clearedServers.add(server.getAddress());
23872388
}
23882389
}
2390+
master.getRSGroupInfoManager().removeServers(clearedServers);
2391+
LOG.info("Remove decommissioned servers {} from RSGroup done", clearedServers);
23892392
}
23902393

23912394
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
@@ -539,5 +539,5 @@ default SplitWALManager getSplitWALManager(){
539539
/**
540540
* @return the {@link RSGroupInfoManager}
541541
*/
542-
RSGroupInfoManager getRSRSGroupInfoManager();
542+
RSGroupInfoManager getRSGroupInfoManager();
543543
}

‎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
@@ -67,6 +67,7 @@
6767
import org.apache.hadoop.hbase.procedure2.ProcedureInMemoryChore;
6868
import org.apache.hadoop.hbase.procedure2.util.StringUtils;
6969
import org.apache.hadoop.hbase.regionserver.SequenceId;
70+
import org.apache.hadoop.hbase.rsgroup.RSGroupBasedLoadBalancer;
7071
import org.apache.hadoop.hbase.util.Bytes;
7172
import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
7273
import org.apache.hadoop.hbase.util.HasThread;
@@ -324,6 +325,11 @@ private LoadBalancer getBalancer() {
324325
return master.getLoadBalancer();
325326
}
326327

328+
private FavoredNodesPromoter getFavoredNodePromoter() {
329+
return (FavoredNodesPromoter) ((RSGroupBasedLoadBalancer) master.getLoadBalancer())
330+
.getInternalBalancer();
331+
}
332+
327333
private MasterProcedureEnv getProcedureEnvironment() {
328334
return master.getMasterProcedureExecutor().getEnvironment();
329335
}
@@ -367,7 +373,7 @@ public RegionStateStore getRegionStateStore() {
367373

368374
public List<ServerName> getFavoredNodes(final RegionInfo regionInfo) {
369375
return this.shouldAssignRegionsWithFavoredNodes
370-
? ((FavoredStochasticBalancer) getBalancer()).getFavoredNodes(regionInfo)
376+
? getFavoredNodePromoter().getFavoredNodes(regionInfo)
371377
: ServerName.EMPTY_SERVER_LIST;
372378
}
373379

@@ -1773,8 +1779,8 @@ public void markRegionAsSplit(final RegionInfo parent, final ServerName serverNa
17731779
regionStateStore.splitRegion(parent, daughterA, daughterB, serverName);
17741780
if (shouldAssignFavoredNodes(parent)) {
17751781
List<ServerName> onlineServers = this.master.getServerManager().getOnlineServersList();
1776-
((FavoredNodesPromoter)getBalancer()).
1777-
generateFavoredNodesForDaughter(onlineServers, parent, daughterA, daughterB);
1782+
getFavoredNodePromoter().generateFavoredNodesForDaughter(onlineServers, parent, daughterA,
1783+
daughterB);
17781784
}
17791785
}
17801786

@@ -1799,8 +1805,7 @@ public void markRegionAsMerged(final RegionInfo child, final ServerName serverNa
17991805
}
18001806
regionStateStore.mergeRegions(child, mergeParents, serverName);
18011807
if (shouldAssignFavoredNodes(child)) {
1802-
((FavoredNodesPromoter)getBalancer()).
1803-
generateFavoredNodesForMergedRegion(child, mergeParents);
1808+
getFavoredNodePromoter().generateFavoredNodesForMergedRegion(child, mergeParents);
18041809
}
18051810
}
18061811

‎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)