From 52e35b4473e6b281de0b5ee967cf18b3948fa3d2 Mon Sep 17 00:00:00 2001
From: stack <stack@apache.org>
Date: Wed, 3 Dec 2014 11:13:36 -0800
Subject: [PATCH] Add timeout on TestDefaultLoadBalancer#testBalancerCluster to
 see if we can stop it hanging as a zombie in precommit builds

---
 .../hadoop/hbase/master/balancer/TestDefaultLoadBalancer.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestDefaultLoadBalancer.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestDefaultLoadBalancer.java
index d905c26b173..817730b6c3e 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestDefaultLoadBalancer.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestDefaultLoadBalancer.java
@@ -109,7 +109,7 @@ public class TestDefaultLoadBalancer extends BalancerTestBase {
    *
    * @throws Exception
    */
-  @Test
+  @Test (timeout=60000)
   public void testBalanceCluster() throws Exception {
 
     for (int[] mockCluster : clusterStateMocks) {