Skip to content

HBASE-25635 CandidateGenerator may miss some region balance actions #3024

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Apache9 merged 2 commits into from
Mar 15, 2021
Merged

HBASE-25635 CandidateGenerator may miss some region balance actions #3024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aaf09cc
HBASE-25635 CandidateGenerator may miss some region balance actions
sunhelly Mar 5, 2021
e185893
Merge branch 'master' into HBASE-25635
sunhelly Mar 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/CandidateGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,12 +124,12 @@ protected BaseLoadBalancer.Cluster.Action getAction(int fromServer, int fromRegi
if (fromServer < 0 || toServer < 0) {
return BaseLoadBalancer.Cluster.NullAction;
}
if (fromRegion > 0 && toRegion > 0) {
if (fromRegion >= 0 && toRegion >= 0) {
return new BaseLoadBalancer.Cluster.SwapRegionsAction(fromServer, fromRegion,
toServer, toRegion);
} else if (fromRegion > 0) {
} else if (fromRegion >= 0) {
return new BaseLoadBalancer.Cluster.MoveRegionAction(fromRegion, fromServer, toServer);
} else if (toRegion > 0) {
} else if (toRegion >= 0) {
return new BaseLoadBalancer.Cluster.MoveRegionAction(toRegion, toServer, fromServer);
} else {
return BaseLoadBalancer.Cluster.NullAction;
Expand Down
7 changes: 7 additions & 0 deletions ...-server/src/main/java/org/apache/hadoop/hbase/master/balancer/StochasticLoadBalancer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,13 @@ protected void setCandidateGenerators(List<CandidateGenerator> customCandidateGe
this.candidateGenerators = customCandidateGenerators;
}

/**
* Exposed for Testing!
*/
public List<CandidateGenerator> getCandidateGenerators() {
return this.candidateGenerators;
}

@Override
protected void setSlop(Configuration conf) {
this.slop = conf.getFloat("hbase.regions.slop", 0.001F);
Expand Down
23 changes: 23 additions & 0 deletions .../org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancerHeterogeneousCost.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ public static void beforeAllTests() throws IOException {
RULES_FILE);
BalancerTestBase.loadBalancer = new StochasticLoadBalancer();
BalancerTestBase.loadBalancer.setConf(BalancerTestBase.conf);
BalancerTestBase.loadBalancer.getCandidateGenerators().add(new FairRandomCandidateGenerator());
}

@Test
Expand Down Expand Up @@ -279,4 +280,26 @@ private ServerAndLoad createServer(final String host) {
ServerName sn = ServerName.valueOf(host, port, startCode);
return new ServerAndLoad(sn, 0);
}

static class FairRandomCandidateGenerator extends
StochasticLoadBalancer.RandomCandidateGenerator {

@Override
public BaseLoadBalancer.Cluster.Action pickRandomRegions(BaseLoadBalancer.Cluster cluster,
int thisServer, int otherServer) {
if (thisServer < 0 || otherServer < 0) {
return BaseLoadBalancer.Cluster.NullAction;
}

int thisRegion = pickRandomRegion(cluster, thisServer, 0.5);
int otherRegion = pickRandomRegion(cluster, otherServer, 0.5);

return getAction(thisServer, thisRegion, otherServer, otherRegion);
}

@Override
BaseLoadBalancer.Cluster.Action generate(BaseLoadBalancer.Cluster cluster) {
return super.generate(cluster);
}
}
}