This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2.4
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.4 by this push:
new d2cba18 HBASE-25759 The master services field in
LocalityBasedCostFunction is never used (#3144)
d2cba18 is described below
commit d2cba187e5d8783658012bcaff909fdd41b154d3
Author: Duo Zhang <[email protected]>
AuthorDate: Mon Apr 12 22:27:01 2021 +0800
HBASE-25759 The master services field in LocalityBasedCostFunction is never
used (#3144)
Signed-off-by: Yulin Niu <[email protected]>
---
.../hbase/master/balancer/BaseLoadBalancer.java | 6 ---
.../master/balancer/StochasticLoadBalancer.java | 53 ++++++----------------
.../balancer/TestStochasticLoadBalancer.java | 5 +-
3 files changed, 16 insertions(+), 48 deletions(-)
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java
index 91215c7..f10f455 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/BaseLoadBalancer.java
@@ -55,7 +55,6 @@ import org.apache.hadoop.hbase.master.MasterServices;
import org.apache.hadoop.hbase.master.RackManager;
import org.apache.hadoop.hbase.master.RegionPlan;
import
org.apache.hadoop.hbase.master.balancer.BaseLoadBalancer.Cluster.Action.Type;
-import org.apache.hadoop.hbase.namequeues.NamedQueueRecorder;
import org.apache.hadoop.hbase.net.Address;
import org.apache.yetus.audience.InterfaceAudience;
import org.slf4j.Logger;
@@ -92,11 +91,6 @@ public abstract class BaseLoadBalancer implements
LoadBalancer {
protected boolean useRegionFinder;
protected boolean isByTable = false;
- /**
- * Use to add balancer decision history to ring-buffer
- */
- protected NamedQueueRecorder namedQueueRecorder;
-
private static class DefaultRackManager extends RackManager {
@Override
public String getRack(ServerName server) {
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java
index b3f4cc7..379fbe1 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java
@@ -159,6 +159,11 @@ public class StochasticLoadBalancer extends
BaseLoadBalancer {
private RegionReplicaRackCostFunction regionReplicaRackCostFunction;
/**
+ * Use to add balancer decision history to ring-buffer
+ */
+ NamedQueueRecorder namedQueueRecorder;
+
+ /**
* The constructor that pass a MetricsStochasticBalancer to BaseLoadBalancer
to replace its
* default MetricsBalancer
*/
@@ -184,8 +189,8 @@ public class StochasticLoadBalancer extends
BaseLoadBalancer {
if (localityCandidateGenerator == null) {
localityCandidateGenerator = new
LocalityBasedCandidateGenerator(services);
}
- localityCost = new ServerLocalityCostFunction(conf, services);
- rackLocalityCost = new RackLocalityCostFunction(conf, services);
+ localityCost = new ServerLocalityCostFunction(conf);
+ rackLocalityCost = new RackLocalityCostFunction(conf);
if (this.candidateGenerators == null) {
candidateGenerators = Lists.newArrayList();
@@ -305,8 +310,6 @@ public class StochasticLoadBalancer extends
BaseLoadBalancer {
@Override
public synchronized void setMasterServices(MasterServices masterServices) {
super.setMasterServices(masterServices);
- this.localityCost.setServices(masterServices);
- this.rackLocalityCost.setServices(masterServices);
this.localityCandidateGenerator.setServices(masterServices);
}
@@ -1057,17 +1060,11 @@ public class StochasticLoadBalancer extends
BaseLoadBalancer {
private double bestLocality; // best case locality across cluster weighted
by local data size
private double locality; // current locality across cluster weighted by
local data size
- private MasterServices services;
-
- LocalityBasedCostFunction(Configuration conf,
- MasterServices srv,
- LocalityType type,
- String localityCostKey,
- float defaultLocalityCost) {
+ LocalityBasedCostFunction(Configuration conf, LocalityType type, String
localityCostKey,
+ float defaultLocalityCost) {
super(conf);
this.type = type;
this.setMultiplier(conf.getFloat(localityCostKey, defaultLocalityCost));
- this.services = srv;
this.locality = 0.0;
this.bestLocality = 0.0;
}
@@ -1077,21 +1074,12 @@ public class StochasticLoadBalancer extends
BaseLoadBalancer {
*/
abstract int regionIndexToEntityIndex(int region);
- public void setServices(MasterServices srvc) {
- this.services = srvc;
- }
-
@Override
void init(Cluster cluster) {
super.init(cluster);
locality = 0.0;
bestLocality = 0.0;
- // If no master, no computation will work, so assume 0 cost
- if (this.services == null) {
- return;
- }
-
for (int region = 0; region < cluster.numRegions; region++) {
locality += getWeightedLocality(region,
regionIndexToEntityIndex(region));
bestLocality += getWeightedLocality(region,
getMostLocalEntityForRegion(region));
@@ -1107,9 +1095,6 @@ public class StochasticLoadBalancer extends
BaseLoadBalancer {
protected void regionMoved(int region, int oldServer, int newServer) {
int oldEntity = type == LocalityType.SERVER ? oldServer :
cluster.serverIndexToRackIndex[oldServer];
int newEntity = type == LocalityType.SERVER ? newServer :
cluster.serverIndexToRackIndex[newServer];
- if (this.services == null) {
- return;
- }
double localityDelta = getWeightedLocality(region, newEntity) -
getWeightedLocality(region, oldEntity);
double normalizedDelta = bestLocality == 0 ? 0.0 : localityDelta /
bestLocality;
locality += normalizedDelta;
@@ -1135,14 +1120,8 @@ public class StochasticLoadBalancer extends
BaseLoadBalancer {
private static final String LOCALITY_COST_KEY =
"hbase.master.balancer.stochastic.localityCost";
private static final float DEFAULT_LOCALITY_COST = 25;
- ServerLocalityCostFunction(Configuration conf, MasterServices srv) {
- super(
- conf,
- srv,
- LocalityType.SERVER,
- LOCALITY_COST_KEY,
- DEFAULT_LOCALITY_COST
- );
+ ServerLocalityCostFunction(Configuration conf) {
+ super(conf, LocalityType.SERVER, LOCALITY_COST_KEY,
DEFAULT_LOCALITY_COST);
}
@Override
@@ -1156,14 +1135,8 @@ public class StochasticLoadBalancer extends
BaseLoadBalancer {
private static final String RACK_LOCALITY_COST_KEY =
"hbase.master.balancer.stochastic.rackLocalityCost";
private static final float DEFAULT_RACK_LOCALITY_COST = 15;
- public RackLocalityCostFunction(Configuration conf, MasterServices
services) {
- super(
- conf,
- services,
- LocalityType.RACK,
- RACK_LOCALITY_COST_KEY,
- DEFAULT_RACK_LOCALITY_COST
- );
+ public RackLocalityCostFunction(Configuration conf) {
+ super(conf, LocalityType.RACK, RACK_LOCALITY_COST_KEY,
DEFAULT_RACK_LOCALITY_COST);
}
@Override
diff --git
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancer.java
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancer.java
index 162ae62..b97679f 100644
---
a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancer.java
+++
b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancer.java
@@ -50,11 +50,12 @@ import
org.apache.hadoop.hbase.testclassification.MasterTests;
import org.apache.hadoop.hbase.testclassification.MediumTests;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
-import
org.apache.hbase.thirdparty.org.apache.commons.collections4.CollectionUtils;
import org.junit.ClassRule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import
org.apache.hbase.thirdparty.org.apache.commons.collections4.CollectionUtils;
+
@Category({ MasterTests.class, MediumTests.class })
public class TestStochasticLoadBalancer extends BalancerTestBase {
@@ -195,7 +196,7 @@ public class TestStochasticLoadBalancer extends
BalancerTestBase {
Configuration conf = HBaseConfiguration.create();
MockNoopMasterServices master = new MockNoopMasterServices();
StochasticLoadBalancer.CostFunction
- costFunction = new ServerLocalityCostFunction(conf, master);
+ costFunction = new ServerLocalityCostFunction(conf);
for (int test = 0; test < clusterRegionLocationMocks.length; test++) {
int[][] clusterRegionLocations = clusterRegionLocationMocks[test];
