Return-Path: Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: (qmail 25563 invoked from network); 11 Oct 2010 15:31:23 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 11 Oct 2010 15:31:23 -0000 Received: (qmail 70194 invoked by uid 500); 11 Oct 2010 15:31:23 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 70105 invoked by uid 500); 11 Oct 2010 15:31:22 -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 70098 invoked by uid 99); 11 Oct 2010 15:31:22 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Oct 2010 15:31:22 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Mon, 11 Oct 2010 15:31:20 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C3396238890A; Mon, 11 Oct 2010 15:30:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1021385 - in /hbase/trunk/src: main/java/org/apache/hadoop/hbase/client/HTable.java test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java Date: Mon, 11 Oct 2010 15:30:58 -0000 To: commits@hbase.apache.org From: stack@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101011153058.C3396238890A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: stack Date: Mon Oct 11 15:30:58 2010 New Revision: 1021385 URL: http://svn.apache.org/viewvc?rev=1021385&view=rev Log: If waiting on a balance, after each unsuccessful attempt, call balancer in case it hasn't been run (Fail on hudson of build #1532 looks to be a postponed balance and then wait on a balance that would never come Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HTable.java hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HTable.java URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HTable.java?rev=1021385&r1=1021384&r2=1021385&view=diff ============================================================================== --- hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HTable.java (original) +++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/HTable.java Mon Oct 11 15:30:58 2010 @@ -19,6 +19,23 @@ */ package org.apache.hadoop.hbase.client; +import java.io.DataInput; +import java.io.DataOutput; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; @@ -38,25 +55,6 @@ import org.apache.hadoop.hbase.util.Byte import org.apache.hadoop.hbase.util.Pair; import org.apache.hadoop.hbase.util.Writables; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.TreeMap; -import java.util.concurrent.Executors; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.ThreadFactory; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicInteger; - -import java.io.DataInput; -import java.io.DataOutput; - /** * Used to communicate with a single HBase table. * Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java?rev=1021385&r1=1021384&r2=1021385&view=diff ============================================================================== --- hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java (original) +++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java Mon Oct 11 15:30:58 2010 @@ -192,6 +192,7 @@ public class TestRegionRebalancing exten Thread.sleep(10000); } catch (InterruptedException e) {} + cluster.getMaster().balance(); continue; }