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 71620200CF3 for ; Thu, 20 Jul 2017 00:32:57 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 6FDFF167011; Wed, 19 Jul 2017 22:32:57 +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 BFD47163A32 for ; Thu, 20 Jul 2017 00:32:56 +0200 (CEST) Received: (qmail 36936 invoked by uid 500); 19 Jul 2017 22:32:53 -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 36548 invoked by uid 99); 19 Jul 2017 22:32:52 -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; Wed, 19 Jul 2017 22:32:52 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 197FAF558A; Wed, 19 Jul 2017 22:32:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: apurtell@apache.org To: commits@hbase.apache.org Date: Wed, 19 Jul 2017 22:33:05 -0000 Message-Id: <3b4fc928eaee464bbe0fd70a52cc4344@git.apache.org> In-Reply-To: <3a85ba2351374748af88e5f4010b9280@git.apache.org> References: <3a85ba2351374748af88e5f4010b9280@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [17/23] hbase git commit: HBASE-16133 RSGroupBasedLoadBalancer.retainAssignment() might miss a region archived-at: Wed, 19 Jul 2017 22:32:57 -0000 HBASE-16133 RSGroupBasedLoadBalancer.retainAssignment() might miss a region Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/81087059 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/81087059 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/81087059 Branch: refs/heads/HBASE-15631-branch-1 Commit: 8108705923b7d287276917e2ca8943d4a710e543 Parents: 1705cb0 Author: Andrew Purtell Authored: Wed Jul 5 15:43:46 2017 -0700 Committer: Andrew Purtell Committed: Wed Jul 19 15:32:37 2017 -0700 ---------------------------------------------------------------------- .../apache/hadoop/hbase/rsgroup/RSGroupBasedLoadBalancer.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/81087059/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 f69f093..c1b3c7d 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 @@ -216,9 +216,10 @@ public class RSGroupBasedLoadBalancer implements RSGroupableBalancer, LoadBalanc List candidateList = filterOfflineServers(info, servers); ServerName server = this.internalBalancer.randomAssignment(region, candidateList); - if (server != null && !assignments.containsKey(server)) { - assignments.put(server, new ArrayList()); - } else if (server != null) { + if (server != null) { + if (!assignments.containsKey(server)) { + assignments.put(server, new ArrayList()); + } assignments.get(server).add(region); } else { //if not server is available assign to bogus so it ends up in RIT