Skip to content

HBASE-22822 : Un/Re-schedule balancer chore with balance_switch #468

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

Closed
virajjasani wants to merge 4 commits into from
Closed

HBASE-22822 : Un/Re-schedule balancer chore with balance_switch #468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cdaa133
HBASE-22822 : Un/Re-schedule balancer chore with balance_switch
virajjasani Aug 8, 2019
472ab75
active master to schedule balancer chore conditionally
virajjasani Aug 9, 2019
0ee0213
do not trigger balancer immediately
virajjasani Aug 9, 2019
e94ab72
s/turnBalancer/switchBalancer/
virajjasani Aug 11, 2019
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
27 changes: 26 additions & 1 deletion hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1104,7 +1104,9 @@ private void finishActiveMasterInitialization(MonitoredTask status) throws IOExc
this.clusterStatusChore = new ClusterStatusChore(this, balancer);
getChoreService().scheduleChore(clusterStatusChore);
this.balancerChore = new BalancerChore(this);
getChoreService().scheduleChore(balancerChore);
if (this.loadBalancerTracker.isBalancerOn()) {
getChoreService().scheduleChore(balancerChore);
}
this.normalizerChore = new RegionNormalizerChore(this);
getChoreService().scheduleChore(normalizerChore);
this.catalogJanitorChore = new CatalogJanitor(this);
Expand Down Expand Up @@ -1673,6 +1675,29 @@ private void balanceThrottling(long nextBalanceStartTime, int maxRegionsInTransi
if (interrupted) Thread.currentThread().interrupt();
}

/**
* Turn the balancer on/off
*
* @param on boolean value indicates whether to turn the balancer on
*/
void switchBalancer(boolean on) {
if (on) {
scheduleBalancerChore();
} else {
cancelBalancerChore();
}
}

private synchronized void scheduleBalancerChore() {
if (!getChoreService().isChoreScheduled(this.balancerChore)) {
getChoreService().scheduleChore(this.balancerChore);
}
}

private void cancelBalancerChore() {
getChoreService().cancelChore(this.balancerChore);
}

public boolean balance() throws IOException {
return balance(false);
}
Expand Down
2 changes: 2 additions & 0 deletions hbase-server/src/main/java/org/apache/hadoop/hbase/master/MasterRpcServices.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,9 +447,11 @@ boolean switchBalancer(final boolean b, BalanceSwitchMode mode) throws IOExcepti
if (mode == BalanceSwitchMode.SYNC) {
synchronized (master.getLoadBalancer()) {
master.loadBalancerTracker.setBalancerOn(newValue);
master.switchBalancer(newValue);
}
} else {
master.loadBalancerTracker.setBalancerOn(newValue);
master.switchBalancer(newValue);
}
} catch (KeeperException ke) {
throw new IOException(ke);
Expand Down
1 change: 0 additions & 1 deletion hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncRegionAdminApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,6 @@ public void testMoveRegion() throws Exception {
}
Thread.sleep(100);
}
admin.balancerSwitch(true).join();
}

@Test
Expand Down
6 changes: 0 additions & 6 deletions ...ver/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,6 @@ public void testRITStateForRollback() throws Exception {
}
assertTrue(cluster.getMaster().getAssignmentManager().getRegionStates().isRegionOnline(hri));
} finally {
admin.balancerSwitch(true, false);
master.setCatalogJanitorEnabled(true);
abortAndWaitForMaster();
TESTING_UTIL.deleteTable(tableName);
Expand Down Expand Up @@ -346,7 +345,6 @@ public void testSplitRollbackOnRegionClosing() throws Exception {
checkAndGetDaughters(tableName);
// OK, so split happened after we cleared the blocking node.
} finally {
admin.balancerSwitch(true, false);
cluster.getMaster().setCatalogJanitorEnabled(true);
t.close();
}
Expand Down Expand Up @@ -423,7 +421,6 @@ public void testShutdownFixupWhenDaughterHasSplit() throws Exception {
}
} finally {
LOG.info("EXITING");
admin.balancerSwitch(true, false);
cluster.getMaster().setCatalogJanitorEnabled(true);
t.close();
}
Expand Down Expand Up @@ -549,7 +546,6 @@ public void testMasterRestartAtRegionSplitPendingCatalogJanitor()
ServerName regionServerOfRegion = regionStates.getRegionServerOfRegion(hri);
assertEquals(null, regionServerOfRegion);
} finally {
TESTING_UTIL.getAdmin().balancerSwitch(true, false);
cluster.getMaster().setCatalogJanitorEnabled(true);
}
}
Expand Down Expand Up @@ -621,7 +617,6 @@ public void testSplitWithRegionReplicas() throws Exception {
SlowMeCopro.getPrimaryCdl().get().countDown();
} finally {
SlowMeCopro.getPrimaryCdl().get().countDown();
admin.balancerSwitch(true, false);
cluster.getMaster().setCatalogJanitorEnabled(true);
t.close();
}
Expand Down Expand Up @@ -730,7 +725,6 @@ public void testSplitRegionWithNoStoreFiles() throws Exception {
assertFalse("Split region can't be unassigned", regionStates.isRegionInTransition(hri));
assertTrue(regionStates.isRegionInState(hri, State.SPLIT));
} finally {
admin.balancerSwitch(true, false);
cluster.getMaster().setCatalogJanitorEnabled(true);
}
}
Expand Down