Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BEBB7C83A for ; Fri, 19 Jul 2013 16:55:03 +0000 (UTC) Received: (qmail 81999 invoked by uid 500); 19 Jul 2013 16:55:03 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 81788 invoked by uid 500); 19 Jul 2013 16:55:02 -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 81781 invoked by uid 99); 19 Jul 2013 16:55:01 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Jul 2013 16:55:01 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Jul 2013 16:54:59 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3098E2388900; Fri, 19 Jul 2013 16:54:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1504936 - /hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/DefaultLoadBalancer.java Date: Fri, 19 Jul 2013 16:54:37 -0000 To: commits@hbase.apache.org From: larsh@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130719165438.3098E2388900@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: larsh Date: Fri Jul 19 16:54:37 2013 New Revision: 1504936 URL: http://svn.apache.org/r1504936 Log: BASE-8432 a table with unbalanced regions will balance indefinitely with the 'org.apache.hadoop.hbase.master.DefaultLoadBalancer' (Wang Qiang and Ted) Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/DefaultLoadBalancer.java Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/DefaultLoadBalancer.java URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/DefaultLoadBalancer.java?rev=1504936&r1=1504935&r2=1504936&view=diff ============================================================================== --- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/DefaultLoadBalancer.java (original) +++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/master/DefaultLoadBalancer.java Fri Jul 19 16:54:37 2013 @@ -330,8 +330,8 @@ public class DefaultLoadBalancer impleme if (regionsToPut == 0) { regionsToPut = 1; - maxToTake--; } + maxToTake -= regionsToPut; underloadedServers.put(server.getKey().getServerName(), regionsToPut); } // number of servers that get new regions @@ -439,6 +439,10 @@ public class DefaultLoadBalancer impleme for (Map.Entry> server : serversByLoad.entrySet()) { int regionCount = server.getKey().getLoad(); + BalanceInfo balanceInfo = serverBalanceInfo.get(server.getKey().getServerName()); + if(balanceInfo != null) { + regionCount += balanceInfo.getNumRegionsAdded(); + } if(regionCount >= max) { break; }