You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/08/22 00:27:09 UTC

[1/9] git commit: ACCUMULO-3073 Increase the timeout a bit more

Repository: accumulo
Updated Branches:
  refs/heads/1.6.1-SNAPSHOT b47c86dcf -> e84ff66a1
  refs/heads/master 98327959f -> eb427d7b9


ACCUMULO-3073 Increase the timeout a bit more


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0088326c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0088326c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0088326c

Branch: refs/heads/1.6.1-SNAPSHOT
Commit: 0088326ca052a6e3851fcda9b3185dd2f67560a1
Parents: b47c86d
Author: Josh Elser <el...@apache.org>
Authored: Thu Aug 21 17:31:25 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Aug 21 17:31:25 2014 -0400

----------------------------------------------------------------------
 .../apache/accumulo/test/functional/DeleteTableDuringSplitIT.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/0088326c/test/src/test/java/org/apache/accumulo/test/functional/DeleteTableDuringSplitIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/DeleteTableDuringSplitIT.java b/test/src/test/java/org/apache/accumulo/test/functional/DeleteTableDuringSplitIT.java
index 4bbdfef..707fc19 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/DeleteTableDuringSplitIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/DeleteTableDuringSplitIT.java
@@ -35,7 +35,7 @@ public class DeleteTableDuringSplitIT extends SimpleMacIT {
   
   @Override
   protected int defaultTimeoutSeconds() {
-    return 10 * 60;
+    return 15 * 60;
   }
 
   @Test


[9/9] git commit: Merge branch '1.6.1-SNAPSHOT'

Posted by el...@apache.org.
Merge branch '1.6.1-SNAPSHOT'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/eb427d7b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/eb427d7b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/eb427d7b

Branch: refs/heads/master
Commit: eb427d7b92e553d45d085f84a65c78baceca8639
Parents: 9832795 e84ff66
Author: Josh Elser <el...@apache.org>
Authored: Thu Aug 21 18:08:22 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Aug 21 18:08:22 2014 -0400

----------------------------------------------------------------------
 .../test/functional/DeleteTableDuringSplitIT.java         |  2 +-
 .../java/org/apache/accumulo/test/functional/MergeIT.java |  2 +-
 .../test/functional/SimpleBalancerFairnessIT.java         | 10 +++++-----
 .../java/org/apache/accumulo/test/functional/SslIT.java   | 10 +++++-----
 .../accumulo/test/functional/SslWithClientAuthIT.java     | 10 +++++-----
 5 files changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------



[8/9] git commit: ACCUMULO-3075 Increase SSL IT timeouts across the board

Posted by el...@apache.org.
ACCUMULO-3075 Increase SSL IT timeouts across the board

Most of the tests copied the same timeout as the underlying
IT they call. This isn't realistic as running with SSL is
typically going to be more costly.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e84ff66a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e84ff66a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e84ff66a

Branch: refs/heads/1.6.1-SNAPSHOT
Commit: e84ff66a13bbdb23cfa32ed9d3d28b435a671359
Parents: f1f6ba7
Author: Josh Elser <el...@apache.org>
Authored: Thu Aug 21 17:59:37 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Aug 21 17:59:37 2014 -0400

----------------------------------------------------------------------
 .../java/org/apache/accumulo/test/functional/SslIT.java   | 10 +++++-----
 .../accumulo/test/functional/SslWithClientAuthIT.java     | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e84ff66a/test/src/test/java/org/apache/accumulo/test/functional/SslIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/SslIT.java b/test/src/test/java/org/apache/accumulo/test/functional/SslIT.java
index eec7d98..7d5e565 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/SslIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/SslIT.java
@@ -34,28 +34,28 @@ public class SslIT extends ConfigurableMacIT {
     configureForSsl(cfg, createSharedTestDir(this.getClass().getName() + "-ssl"));
   }
 
-  @Test(timeout = 60 * 1000)
+  @Test(timeout = 4 * 60 * 1000)
   public void binary() throws AccumuloException, AccumuloSecurityException, Exception {
     getConnector().tableOperations().create("bt");
     BinaryIT.runTest(getConnector());
   }
 
-  @Test(timeout = 2 * 60 * 1000)
+  @Test(timeout = 4 * 60 * 1000)
   public void concurrency() throws Exception {
     ConcurrencyIT.runTest(getConnector());
   }
 
-  @Test(timeout = 2 * 60 * 1000)
+  @Test(timeout = 4 * 60 * 1000)
   public void adminStop() throws Exception {
     ShutdownIT.runAdminStopTest(getConnector(), getCluster());
   }
 
-  @Test(timeout = 5 * 60 * 1000)
+  @Test(timeout = 6 * 60 * 1000)
   public void bulk() throws Exception {
     BulkIT.runTest(getConnector(), getUniqueNames(1)[0], this.getClass().getName(), testName.getMethodName());
   }
 
-  @Test(timeout = 60 * 1000)
+  @Test(timeout = 2 * 60 * 1000)
   public void mapReduce() throws Exception {
     MapReduceIT.runTest(getConnector(), getCluster());
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e84ff66a/test/src/test/java/org/apache/accumulo/test/functional/SslWithClientAuthIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/SslWithClientAuthIT.java b/test/src/test/java/org/apache/accumulo/test/functional/SslWithClientAuthIT.java
index 3b691a6..6fca291 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/SslWithClientAuthIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/SslWithClientAuthIT.java
@@ -41,31 +41,31 @@ public class SslWithClientAuthIT extends SslIT {
   }
 
   @Override
-  @Test(timeout = 60000)
+  @Test(timeout = 4 * 60 * 1000)
   public void binary() throws AccumuloException, AccumuloSecurityException, Exception {
     super.binary();
   }
 
   @Override
-  @Test(timeout = 120000)
+  @Test(timeout = 4 * 60 * 1000)
   public void concurrency() throws Exception {
     super.concurrency();
   }
 
   @Override
-  @Test(timeout = 120000)
+  @Test(timeout = 4 * 60 * 1000)
   public void adminStop() throws Exception {
     super.adminStop();
   }
 
   @Override
-  @Test(timeout = 4 * 60 * 1000)
+  @Test(timeout = 6 * 60 * 1000)
   public void bulk() throws Exception {
     super.bulk();
   }
 
   @Override
-  @Test(timeout = 60000)
+  @Test(timeout = 2 * 60 * 1000)
   public void mapReduce() throws Exception {
     super.mapReduce();
   }


[2/9] git commit: ACCUMULO-3073 Increase the timeout a bit more

Posted by el...@apache.org.
ACCUMULO-3073 Increase the timeout a bit more


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0088326c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0088326c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0088326c

Branch: refs/heads/master
Commit: 0088326ca052a6e3851fcda9b3185dd2f67560a1
Parents: b47c86d
Author: Josh Elser <el...@apache.org>
Authored: Thu Aug 21 17:31:25 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Aug 21 17:31:25 2014 -0400

----------------------------------------------------------------------
 .../apache/accumulo/test/functional/DeleteTableDuringSplitIT.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/0088326c/test/src/test/java/org/apache/accumulo/test/functional/DeleteTableDuringSplitIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/DeleteTableDuringSplitIT.java b/test/src/test/java/org/apache/accumulo/test/functional/DeleteTableDuringSplitIT.java
index 4bbdfef..707fc19 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/DeleteTableDuringSplitIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/DeleteTableDuringSplitIT.java
@@ -35,7 +35,7 @@ public class DeleteTableDuringSplitIT extends SimpleMacIT {
   
   @Override
   protected int defaultTimeoutSeconds() {
-    return 10 * 60;
+    return 15 * 60;
   }
 
   @Test


[7/9] git commit: ACCUMULO-3075 Increase SSL IT timeouts across the board

Posted by el...@apache.org.
ACCUMULO-3075 Increase SSL IT timeouts across the board

Most of the tests copied the same timeout as the underlying
IT they call. This isn't realistic as running with SSL is
typically going to be more costly.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e84ff66a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e84ff66a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e84ff66a

Branch: refs/heads/master
Commit: e84ff66a13bbdb23cfa32ed9d3d28b435a671359
Parents: f1f6ba7
Author: Josh Elser <el...@apache.org>
Authored: Thu Aug 21 17:59:37 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Aug 21 17:59:37 2014 -0400

----------------------------------------------------------------------
 .../java/org/apache/accumulo/test/functional/SslIT.java   | 10 +++++-----
 .../accumulo/test/functional/SslWithClientAuthIT.java     | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e84ff66a/test/src/test/java/org/apache/accumulo/test/functional/SslIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/SslIT.java b/test/src/test/java/org/apache/accumulo/test/functional/SslIT.java
index eec7d98..7d5e565 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/SslIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/SslIT.java
@@ -34,28 +34,28 @@ public class SslIT extends ConfigurableMacIT {
     configureForSsl(cfg, createSharedTestDir(this.getClass().getName() + "-ssl"));
   }
 
-  @Test(timeout = 60 * 1000)
+  @Test(timeout = 4 * 60 * 1000)
   public void binary() throws AccumuloException, AccumuloSecurityException, Exception {
     getConnector().tableOperations().create("bt");
     BinaryIT.runTest(getConnector());
   }
 
-  @Test(timeout = 2 * 60 * 1000)
+  @Test(timeout = 4 * 60 * 1000)
   public void concurrency() throws Exception {
     ConcurrencyIT.runTest(getConnector());
   }
 
-  @Test(timeout = 2 * 60 * 1000)
+  @Test(timeout = 4 * 60 * 1000)
   public void adminStop() throws Exception {
     ShutdownIT.runAdminStopTest(getConnector(), getCluster());
   }
 
-  @Test(timeout = 5 * 60 * 1000)
+  @Test(timeout = 6 * 60 * 1000)
   public void bulk() throws Exception {
     BulkIT.runTest(getConnector(), getUniqueNames(1)[0], this.getClass().getName(), testName.getMethodName());
   }
 
-  @Test(timeout = 60 * 1000)
+  @Test(timeout = 2 * 60 * 1000)
   public void mapReduce() throws Exception {
     MapReduceIT.runTest(getConnector(), getCluster());
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e84ff66a/test/src/test/java/org/apache/accumulo/test/functional/SslWithClientAuthIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/SslWithClientAuthIT.java b/test/src/test/java/org/apache/accumulo/test/functional/SslWithClientAuthIT.java
index 3b691a6..6fca291 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/SslWithClientAuthIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/SslWithClientAuthIT.java
@@ -41,31 +41,31 @@ public class SslWithClientAuthIT extends SslIT {
   }
 
   @Override
-  @Test(timeout = 60000)
+  @Test(timeout = 4 * 60 * 1000)
   public void binary() throws AccumuloException, AccumuloSecurityException, Exception {
     super.binary();
   }
 
   @Override
-  @Test(timeout = 120000)
+  @Test(timeout = 4 * 60 * 1000)
   public void concurrency() throws Exception {
     super.concurrency();
   }
 
   @Override
-  @Test(timeout = 120000)
+  @Test(timeout = 4 * 60 * 1000)
   public void adminStop() throws Exception {
     super.adminStop();
   }
 
   @Override
-  @Test(timeout = 4 * 60 * 1000)
+  @Test(timeout = 6 * 60 * 1000)
   public void bulk() throws Exception {
     super.bulk();
   }
 
   @Override
-  @Test(timeout = 60000)
+  @Test(timeout = 2 * 60 * 1000)
   public void mapReduce() throws Exception {
     super.mapReduce();
   }


[3/9] git commit: ACCUMULO-3074 Increase the timeout for MergeIT#mergeTest

Posted by el...@apache.org.
ACCUMULO-3074 Increase the timeout for MergeIT#mergeTest


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6df57998
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6df57998
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6df57998

Branch: refs/heads/1.6.1-SNAPSHOT
Commit: 6df579984697e5022b94b3490c667cd012d6be05
Parents: 0088326
Author: Josh Elser <el...@apache.org>
Authored: Thu Aug 21 17:42:03 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Aug 21 17:42:03 2014 -0400

----------------------------------------------------------------------
 .../src/test/java/org/apache/accumulo/test/functional/MergeIT.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/6df57998/test/src/test/java/org/apache/accumulo/test/functional/MergeIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/MergeIT.java b/test/src/test/java/org/apache/accumulo/test/functional/MergeIT.java
index 80ea6b2..62cb141 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/MergeIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/MergeIT.java
@@ -99,7 +99,7 @@ public class MergeIT extends SimpleMacIT {
     return strings;
   }
 
-  @Test(timeout = 4 * 60 * 1000)
+  @Test(timeout = 8 * 60 * 1000)
   public void mergeTest() throws Exception {
     int tc = 0;
     Connector c = getConnector();


[4/9] git commit: ACCUMULO-3074 Increase the timeout for MergeIT#mergeTest

Posted by el...@apache.org.
ACCUMULO-3074 Increase the timeout for MergeIT#mergeTest


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6df57998
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6df57998
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6df57998

Branch: refs/heads/master
Commit: 6df579984697e5022b94b3490c667cd012d6be05
Parents: 0088326
Author: Josh Elser <el...@apache.org>
Authored: Thu Aug 21 17:42:03 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Aug 21 17:42:03 2014 -0400

----------------------------------------------------------------------
 .../src/test/java/org/apache/accumulo/test/functional/MergeIT.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/6df57998/test/src/test/java/org/apache/accumulo/test/functional/MergeIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/MergeIT.java b/test/src/test/java/org/apache/accumulo/test/functional/MergeIT.java
index 80ea6b2..62cb141 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/MergeIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/MergeIT.java
@@ -99,7 +99,7 @@ public class MergeIT extends SimpleMacIT {
     return strings;
   }
 
-  @Test(timeout = 4 * 60 * 1000)
+  @Test(timeout = 8 * 60 * 1000)
   public void mergeTest() throws Exception {
     int tc = 0;
     Connector c = getConnector();


[5/9] git commit: ACCUMULO-3076 Increase the timeout for SimpleBalancerFairnessIT

Posted by el...@apache.org.
ACCUMULO-3076 Increase the timeout for SimpleBalancerFairnessIT


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f1f6ba77
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f1f6ba77
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f1f6ba77

Branch: refs/heads/1.6.1-SNAPSHOT
Commit: f1f6ba7724df9cd91da6d6692ba8f97f0d108ac1
Parents: 6df5799
Author: Josh Elser <el...@apache.org>
Authored: Thu Aug 21 17:58:46 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Aug 21 17:58:46 2014 -0400

----------------------------------------------------------------------
 .../test/functional/SimpleBalancerFairnessIT.java         | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/f1f6ba77/test/src/test/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java b/test/src/test/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java
index ce286d5..6904563 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java
@@ -41,7 +41,7 @@ import org.apache.hadoop.conf.Configuration;
 import org.junit.Test;
 
 public class SimpleBalancerFairnessIT extends ConfigurableMacIT {
-  
+
   @Override
   public void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) {
     Map<String,String> siteConfig = new HashMap<String,String>();
@@ -49,10 +49,10 @@ public class SimpleBalancerFairnessIT extends ConfigurableMacIT {
     siteConfig.put(Property.TSERV_MAJC_DELAY.getKey(), "0");
     cfg.setSiteConfig(siteConfig);
   }
-  
+
   @Override
   protected int defaultTimeoutSeconds() {
-    return 7 * 60;
+    return 10 * 60;
   }
 
   @Test
@@ -69,7 +69,7 @@ public class SimpleBalancerFairnessIT extends ConfigurableMacIT {
     c.tableOperations().flush("test_ingest", null, null, false);
     UtilWaitThread.sleep(15 * 1000);
     Credentials creds = new Credentials("root", new PasswordToken(ROOT_PASSWORD));
-    
+
     MasterClientService.Iface client = null;
     MasterMonitorInfo stats = null;
     try {
@@ -91,5 +91,5 @@ public class SimpleBalancerFairnessIT extends ConfigurableMacIT {
     for (int i = 1; i < counts.size(); i++)
       assertTrue(Math.abs(counts.get(0) - counts.get(i)) <= tservers.size());
   }
-  
+
 }


[6/9] git commit: ACCUMULO-3076 Increase the timeout for SimpleBalancerFairnessIT

Posted by el...@apache.org.
ACCUMULO-3076 Increase the timeout for SimpleBalancerFairnessIT


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f1f6ba77
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f1f6ba77
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f1f6ba77

Branch: refs/heads/master
Commit: f1f6ba7724df9cd91da6d6692ba8f97f0d108ac1
Parents: 6df5799
Author: Josh Elser <el...@apache.org>
Authored: Thu Aug 21 17:58:46 2014 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Aug 21 17:58:46 2014 -0400

----------------------------------------------------------------------
 .../test/functional/SimpleBalancerFairnessIT.java         | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/f1f6ba77/test/src/test/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java b/test/src/test/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java
index ce286d5..6904563 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/SimpleBalancerFairnessIT.java
@@ -41,7 +41,7 @@ import org.apache.hadoop.conf.Configuration;
 import org.junit.Test;
 
 public class SimpleBalancerFairnessIT extends ConfigurableMacIT {
-  
+
   @Override
   public void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) {
     Map<String,String> siteConfig = new HashMap<String,String>();
@@ -49,10 +49,10 @@ public class SimpleBalancerFairnessIT extends ConfigurableMacIT {
     siteConfig.put(Property.TSERV_MAJC_DELAY.getKey(), "0");
     cfg.setSiteConfig(siteConfig);
   }
-  
+
   @Override
   protected int defaultTimeoutSeconds() {
-    return 7 * 60;
+    return 10 * 60;
   }
 
   @Test
@@ -69,7 +69,7 @@ public class SimpleBalancerFairnessIT extends ConfigurableMacIT {
     c.tableOperations().flush("test_ingest", null, null, false);
     UtilWaitThread.sleep(15 * 1000);
     Credentials creds = new Credentials("root", new PasswordToken(ROOT_PASSWORD));
-    
+
     MasterClientService.Iface client = null;
     MasterMonitorInfo stats = null;
     try {
@@ -91,5 +91,5 @@ public class SimpleBalancerFairnessIT extends ConfigurableMacIT {
     for (int i = 1; i < counts.size(); i++)
       assertTrue(Math.abs(counts.get(0) - counts.get(i)) <= tservers.size());
   }
-  
+
 }