From f7c84054146bbe5dc5223e2155303649e4716131 Mon Sep 17 00:00:00 2001 From: Guangxu Cheng Date: Tue, 16 May 2017 11:31:13 +0800 Subject: [PATCH] HBASE-18051 balance_rsgroup still run when the Load Balancer is not enabled. --- .../hadoop/hbase/rsgroup/RSGroupAdminServer.java | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupAdminServer.java b/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupAdminServer.java index 3c0cccf..718c7c1 100644 --- a/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupAdminServer.java +++ b/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupAdminServer.java @@ -38,6 +38,7 @@ import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.constraint.ConstraintException; import org.apache.hadoop.hbase.master.AssignmentManager; +import org.apache.hadoop.hbase.master.HMaster; import org.apache.hadoop.hbase.master.LoadBalancer; import org.apache.hadoop.hbase.master.MasterServices; import org.apache.hadoop.hbase.master.RegionPlan; @@ -492,6 +493,8 @@ public class RSGroupAdminServer implements RSGroupAdmin { boolean balancerRan; synchronized (balancer) { + // If balance not true, don't run balancer. + if (!((HMaster) master).isBalancerOn()) return false; if (master.getMasterCoprocessorHost() != null) { master.getMasterCoprocessorHost().preBalanceRSGroup(groupName); } -- 1.7.1