Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B80AB200D30 for ; Mon, 30 Oct 2017 20:54:28 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id B6542160BE4; Mon, 30 Oct 2017 19:54:28 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 084D71609D5 for ; Mon, 30 Oct 2017 20:54:27 +0100 (CET) Received: (qmail 13807 invoked by uid 500); 30 Oct 2017 19:54:27 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 13798 invoked by uid 99); 30 Oct 2017 19:54:27 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Oct 2017 19:54:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6853DDFA0E; Mon, 30 Oct 2017 19:54:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: chia7712@apache.org To: commits@hbase.apache.org Message-Id: <43ff308c5cf24cccba32fc683e50416b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-18602 rsgroup cleanup unassign code Date: Mon, 30 Oct 2017 19:54:24 +0000 (UTC) archived-at: Mon, 30 Oct 2017 19:54:28 -0000 Repository: hbase Updated Branches: refs/heads/branch-1.4 7e6e3f8bc -> 57e6dd035 HBASE-18602 rsgroup cleanup unassign code Signed-off-by: Chia-Ping Tsai Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/57e6dd03 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/57e6dd03 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/57e6dd03 Branch: refs/heads/branch-1.4 Commit: 57e6dd035b14dfc79c8ead16cb00610f8038e739 Parents: 7e6e3f8 Author: Wang, Xinglong Authored: Tue Oct 31 03:04:34 2017 +0800 Committer: Chia-Ping Tsai Committed: Tue Oct 31 03:48:34 2017 +0800 ---------------------------------------------------------------------- .../hadoop/hbase/rsgroup/RSGroupBasedLoadBalancer.java | 10 ---------- 1 file changed, 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/57e6dd03/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupBasedLoadBalancer.java ---------------------------------------------------------------------- diff --git a/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupBasedLoadBalancer.java b/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupBasedLoadBalancer.java index d7f9498..e1bcb25 100644 --- a/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupBasedLoadBalancer.java +++ b/hbase-rsgroup/src/main/java/org/apache/hadoop/hbase/rsgroup/RSGroupBasedLoadBalancer.java @@ -25,7 +25,6 @@ import com.google.common.collect.LinkedListMultimap; import com.google.common.collect.ListMultimap; import com.google.common.collect.Lists; import com.google.common.collect.Maps; - import java.io.IOException; import java.util.ArrayList; import java.util.Collection; @@ -37,10 +36,8 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeMap; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.ClusterStatus; import org.apache.hadoop.hbase.HBaseIOException; @@ -350,7 +347,6 @@ public class RSGroupBasedLoadBalancer implements RSGroupableBalancer, LoadBalanc Map> existingAssignments){ Map> correctAssignments = new TreeMap>(); - List misplacedRegions = new LinkedList(); correctAssignments.put(LoadBalancer.BOGUS_SERVER_NAME, new LinkedList()); for (Map.Entry> assignments : existingAssignments.entrySet()){ ServerName sName = assignments.getKey(); @@ -372,12 +368,6 @@ public class RSGroupBasedLoadBalancer implements RSGroupableBalancer, LoadBalanc } } } - - //TODO bulk unassign? - //unassign misplaced regions, so that they are assigned to correct groups. - for(HRegionInfo info: misplacedRegions) { - this.masterServices.getAssignmentManager().unassign(info); - } return correctAssignments; }