You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bi...@apache.org on 2020/01/08 11:04:37 UTC
[hbase] branch branch-2.2 updated: HBASE-23651 Region balance
throttling can be disabled (#991)
This is an automated email from the ASF dual-hosted git repository.
binlijin pushed a commit to branch branch-2.2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.2 by this push:
new c47f9e6 HBASE-23651 Region balance throttling can be disabled (#991)
c47f9e6 is described below
commit c47f9e6d74e0e64c045cada67167a2ece363a1b4
Author: binlijin <bi...@gmail.com>
AuthorDate: Wed Jan 8 19:01:22 2020 +0800
HBASE-23651 Region balance throttling can be disabled (#991)
Signed-off-by: Viraj Jasani <vj...@apache.org>
Signed-off-by: Anoop Sam John <an...@apache.org>
---
.../java/org/apache/hadoop/hbase/master/HMaster.java | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index 90b8309..b1bf37c 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -1585,12 +1585,10 @@ public class HMaster extends HRegionServer implements MasterServices {
* @return Maximum time we should run balancer for
*/
private int getMaxBalancingTime() {
- int maxBalancingTime = getConfiguration().getInt(HConstants.HBASE_BALANCER_MAX_BALANCING, -1);
- if (maxBalancingTime == -1) {
- // if max balancing time isn't set, defaulting it to period time
- maxBalancingTime = getConfiguration().getInt(HConstants.HBASE_BALANCER_PERIOD,
- HConstants.DEFAULT_HBASE_BALANCER_PERIOD);
- }
+ // if max balancing time isn't set, defaulting it to period time
+ int maxBalancingTime = getConfiguration().getInt(HConstants.HBASE_BALANCER_MAX_BALANCING,
+ getConfiguration()
+ .getInt(HConstants.HBASE_BALANCER_PERIOD, HConstants.DEFAULT_HBASE_BALANCER_PERIOD));
return maxBalancingTime;
}
@@ -1757,11 +1755,14 @@ public class HMaster extends HRegionServer implements MasterServices {
//rpCount records balance plans processed, does not care if a plan succeeds
rpCount++;
- balanceThrottling(balanceStartTime + rpCount * balanceInterval, maxRegionsInTransition,
+ if (this.maxBlancingTime > 0) {
+ balanceThrottling(balanceStartTime + rpCount * balanceInterval, maxRegionsInTransition,
cutoffTime);
+ }
// if performing next balance exceeds cutoff time, exit the loop
- if (rpCount < plans.size() && System.currentTimeMillis() > cutoffTime) {
+ if (this.maxBlancingTime > 0 && rpCount < plans.size()
+ && System.currentTimeMillis() > cutoffTime) {
// TODO: After balance, there should not be a cutoff time (keeping it as
// a security net for now)
LOG.debug("No more balancing till next balance run; maxBalanceTime="