accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject [2/4] git commit: ACCUMULO-2295 IT timing adjustments
Date Sat, 01 Feb 2014 02:31:22 GMT
ACCUMULO-2295 IT timing adjustments


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 6a88722c3bbea4f40d01b9f94ab667aa55bee8ed
Parents: be152d8
Author: John Vines <vines@apache.org>
Authored: Fri Jan 31 15:43:04 2014 -0500
Committer: John Vines <vines@apache.org>
Committed: Fri Jan 31 21:29:53 2014 -0500

----------------------------------------------------------------------
 .../test/functional/BatchWriterFlushIT.java     |  2 +-
 .../accumulo/test/functional/BinaryIT.java      |  4 +--
 .../accumulo/test/functional/BloomFilterIT.java |  2 +-
 .../functional/BulkSplitOptimizationIT.java     |  2 +-
 .../accumulo/test/functional/ExamplesIT.java    | 28 ++++++++++----------
 .../test/functional/GarbageCollectorIT.java     |  2 +-
 .../test/functional/MasterFailoverIT.java       |  2 +-
 .../accumulo/test/functional/ReadWriteIT.java   |  2 +-
 .../accumulo/test/functional/RestartIT.java     |  2 +-
 .../functional/SimpleBalancerFairnessIT.java    |  2 +-
 .../test/functional/SslWithClientAuthIT.java    |  2 +-
 .../accumulo/test/functional/StartIT.java       |  2 +-
 12 files changed, 26 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/6a88722c/test/src/test/java/org/apache/accumulo/test/functional/BatchWriterFlushIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/BatchWriterFlushIT.java
b/test/src/test/java/org/apache/accumulo/test/functional/BatchWriterFlushIT.java
index e77709d..3458de0 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/BatchWriterFlushIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/BatchWriterFlushIT.java
@@ -42,7 +42,7 @@ public class BatchWriterFlushIT extends SimpleMacIT {
 
   private static final int NUM_TO_FLUSH = 100000;
 
-  @Test(timeout = 60 * 1000)
+  @Test(timeout = 90 * 1000)
   public void run() throws Exception {
     Connector c = getConnector();
     String[] tableNames = getTableNames(2);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6a88722c/test/src/test/java/org/apache/accumulo/test/functional/BinaryIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/BinaryIT.java b/test/src/test/java/org/apache/accumulo/test/functional/BinaryIT.java
index aad112e..d5a4ffd 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/BinaryIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/BinaryIT.java
@@ -28,14 +28,14 @@ import org.junit.Test;
 
 public class BinaryIT extends ConfigurableMacIT {
 
-  @Test(timeout = 60 * 1000)
+  @Test(timeout = 90 * 1000)
   public void test() throws Exception {
     Connector c = getConnector();
     c.tableOperations().create("bt");
     runTest(c);
   }
 
-  @Test(timeout = 60 * 1000)
+  @Test(timeout = 90 * 1000)
   public void testPreSplit() throws Exception {
     Connector c = getConnector();
     c.tableOperations().create("bt");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6a88722c/test/src/test/java/org/apache/accumulo/test/functional/BloomFilterIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/BloomFilterIT.java b/test/src/test/java/org/apache/accumulo/test/functional/BloomFilterIT.java
index 8824167..e3914a1 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/BloomFilterIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/BloomFilterIT.java
@@ -59,7 +59,7 @@ public class BloomFilterIT extends ConfigurableMacIT {
     cfg.setSiteConfig(siteConfig );
   }
   
-  @Test(timeout = 4 * 60 *1000)
+  @Test(timeout = 6 * 60 *1000)
   public void test() throws Exception {
     Connector c = getConnector();
     for (String table : "bt1 bt2 bt3 bt4".split(" ")) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6a88722c/test/src/test/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java
b/test/src/test/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java
index c2fe211..337bd4f 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/BulkSplitOptimizationIT.java
@@ -53,7 +53,7 @@ public class BulkSplitOptimizationIT extends ConfigurableMacIT {
   static final int ROWS = 100000;
   static final int SPLITS = 99;
 
-  @Test(timeout = 90 * 1000)
+  @Test(timeout = 2 * 60 * 1000)
   public void testBulkSplitOptimization() throws Exception {
     final Connector c = getConnector();
     c.tableOperations().create(TABLE_NAME);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6a88722c/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
index 6ac0cd3..8d0cb48 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/ExamplesIT.java
@@ -134,7 +134,7 @@ public class ExamplesIT extends AbstractMacIT {
     return cluster.getConfig().getDir().getAbsolutePath();
   }
 
-  @Test(timeout = 15 * 1000)
+  @Test(timeout = 45 * 1000)
   public void testTrace() throws Exception {
     Process trace = exec(TraceServer.class);
     while (!c.tableOperations().exists("trace"))
@@ -161,7 +161,7 @@ public class ExamplesIT extends AbstractMacIT {
     return cluster.exec(class1);
   }
 
-  @Test(timeout = 45 * 1000)
+  @Test(timeout = 90 * 1000)
   public void testDirList() throws Exception {
     goodExec(Ingest.class, "-i", instance, "-z", keepers, "-u", user, "-p", passwd, "--dirTable",
"dirTable", "--indexTable", "indexTable", "--dataTable",
         "dataTable", "--vis", visibility, "--chunkSize", 10000 + "", cluster.getConfig().getDir().getAbsolutePath());
@@ -193,7 +193,7 @@ public class ExamplesIT extends AbstractMacIT {
     assertEquals(0, count);
   }
 
-  @Test(timeout = 20 * 1000)
+  @Test(timeout = 50 * 1000)
   public void testBloomFilters() throws Exception {
     c.tableOperations().create("bloom_test");
     c.tableOperations().setProperty("bloom_test", Property.TABLE_BLOOM_ENABLED.getKey(),
"true");
@@ -217,7 +217,7 @@ public class ExamplesIT extends AbstractMacIT {
     assertTrue(diff2 < diff);
   }
 
-  @Test(timeout = 2 * 60 * 1000)
+  @Test(timeout = 3 * 60 * 1000)
   public void testShardedIndex() throws Exception {
     c.tableOperations().create("shard");
     c.tableOperations().create("doc2term");
@@ -242,7 +242,7 @@ public class ExamplesIT extends AbstractMacIT {
         "5", "--count", "1000");
   }
 
-  @Test(timeout = 2 * 1000)
+  @Test(timeout = 10 * 1000)
   public void testMaxMutationConstraint() throws Exception {
     c.tableOperations().create("test_ingest");
     c.tableOperations().addConstraint("test_ingest", MaxMutationSize.class.getName());
@@ -256,7 +256,7 @@ public class ExamplesIT extends AbstractMacIT {
     }
   }
 
-  @Test(timeout = 20 * 1000)
+  @Test(timeout = 60 * 1000)
   public void testBulkIngest() throws Exception {
     goodExec(GenerateTestData.class, "--start-row", "0", "--count", "10000", "--output",
dir + "/tmp/input/data");
     goodExec(SetupTable.class, "-i", instance, "-z", keepers, "-u", user, "-p", passwd, "--table",
"bulkTable");
@@ -264,7 +264,7 @@ public class ExamplesIT extends AbstractMacIT {
         "--workDir", dir + "/tmp");
   }
 
-  @Test(timeout = 1 * 60 * 1000)
+  @Test(timeout = 2 * 60 * 1000)
   public void testTeraSortAndRead() throws Exception {
     String sorted = "sorted";
     goodExec(TeraSortIngest.class, "--count", (1000 * 1000) + "", "-nk", "10", "-xk", "10",
"-nv", "10", "-xv", "10", "-t", sorted, "-i", instance, "-z",
@@ -274,7 +274,7 @@ public class ExamplesIT extends AbstractMacIT {
     goodExec(TableToFile.class, "-i", instance, "-z", keepers, "-u", user, "-p", passwd,
"-t", sorted, "--output", dir + "/tmp/tableFile");
   }
 
-  @Test(timeout = 10 * 1000)
+  @Test(timeout = 30 * 1000)
   public void testWordCount() throws Exception {
     c.tableOperations().create("wordCount");
     is = new IteratorSetting(10, SummingCombiner.class);
@@ -292,22 +292,22 @@ public class ExamplesIT extends AbstractMacIT {
     goodExec(ReadData.class, "-i", instance, "-z", keepers, "-u", user, "-p", passwd, "-t",
helloBatch);
   }
 
-  @Test(timeout = 90 * 1000)
+  @Test(timeout = 5 * 60 * 1000)
   public void testIsolatedScansWithInterference() throws Exception {
     goodExec(InterferenceTest.class, "-i", instance, "-z", keepers, "-u", user, "-p", passwd,
"-t", "itest1", "--iterations", "100000", "--isolated");
   }
 
-  @Test(timeout = 75 * 1000)
+  @Test(timeout = 3 * 60 * 1000)
   public void testScansWithInterference() throws Exception {
     goodExec(InterferenceTest.class, "-i", instance, "-z", keepers, "-u", user, "-p", passwd,
"-t", "itest2", "--iterations", "100000");
   }
 
-  @Test(timeout = 5 * 1000)
+  @Test(timeout = 20 * 1000)
   public void testRowOperations() throws Exception {
     goodExec(RowOperations.class, "-i", instance, "-z", keepers, "-u", user, "-p", passwd);
   }
 
-  @Test(timeout = 6 * 1000)
+  @Test(timeout = 15 * 1000)
   public void testBatchWriter() throws Exception {
     c.tableOperations().create("test");
     goodExec(SequentialBatchWriter.class, "-i", instance, "-z", keepers, "-u", user, "-p",
passwd, "-t", "test", "--start", "0", "--num", "100000", "--size",
@@ -315,7 +315,7 @@ public class ExamplesIT extends AbstractMacIT {
 
   }
 
-  @Test(timeout = 12 * 1000)
+  @Test(timeout = 45 * 1000)
   public void testReadWriteAndDelete() throws Exception {
     String test2 = "test2";
     goodExec(ReadWriteExample.class, "-i", instance, "-z", keepers, "-u", user, "-p", passwd,
"--auths", auths, "--table", test2, "--createtable", "-c",
@@ -324,7 +324,7 @@ public class ExamplesIT extends AbstractMacIT {
 
   }
 
-  @Test(timeout = 20 * 1000)
+  @Test(timeout = 50 * 1000)
   public void testRandomBatchesAndFlush() throws Exception {
     String test3 = "test3";
     c.tableOperations().create(test3);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6a88722c/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
b/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
index 36ff31d..81377bc 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
@@ -119,7 +119,7 @@ public class GarbageCollectorIT extends ConfigurableMacIT {
 
     // restart GC
     getCluster().start();
-    UtilWaitThread.sleep(10 * 1000);
+    UtilWaitThread.sleep(15 * 1000);
     int after = countFiles();
     VerifyIngest.verifyIngest(c, vopts, new ScannerOpts());
     assertTrue(after < before);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6a88722c/test/src/test/java/org/apache/accumulo/test/functional/MasterFailoverIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/MasterFailoverIT.java
b/test/src/test/java/org/apache/accumulo/test/functional/MasterFailoverIT.java
index 47efb54..1fbe2ff 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/MasterFailoverIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/MasterFailoverIT.java
@@ -35,7 +35,7 @@ public class MasterFailoverIT extends ConfigurableMacIT {
     cfg.setSiteConfig(Collections.singletonMap(Property.INSTANCE_ZK_TIMEOUT.getKey(), "5s"));
   }
 
-  @Test(timeout = 60 * 1000)
+  @Test(timeout = 90 * 1000)
   public void test() throws Exception {
     Connector c = getConnector();
     c.tableOperations().create("test_ingest");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6a88722c/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java b/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java
index a44f0ec..834d3d7 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/ReadWriteIT.java
@@ -230,7 +230,7 @@ public class ReadWriteIT extends ConfigurableMacIT {
     assertTrue(foundFile);
   }
   
-  @Test(timeout = 5 * 60 * 1000)
+  @Test(timeout = 6 * 60 * 1000)
   public void localityGroupChange() throws Exception {
     // Make changes to locality groups and ensure nothing is lostssh
     final Connector connector = getConnector();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6a88722c/test/src/test/java/org/apache/accumulo/test/functional/RestartIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/RestartIT.java b/test/src/test/java/org/apache/accumulo/test/functional/RestartIT.java
index e0dbb34..709aa1d 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/RestartIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/RestartIT.java
@@ -148,7 +148,7 @@ public class RestartIT extends ConfigurableMacIT {
     assertEquals(0, cluster.exec(Admin.class, "stopAll").waitFor());
   }
 
-  @Test(timeout = 10 * 60 * 1000)
+  @Test(timeout = 8 * 60 * 1000)
   public void shutdownDuringCompactingSplitting() throws Exception {
     Connector c = getConnector();
     c.tableOperations().create("test_ingest");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6a88722c/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 3352357..fcb19fd 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
@@ -49,7 +49,7 @@ public class SimpleBalancerFairnessIT extends ConfigurableMacIT {
     cfg.setSiteConfig(siteConfig);
   }
   
-  @Test(timeout = 6 * 60 * 1000)
+  @Test(timeout = 7 * 60 * 1000)
   public void simpleBalancerFairness() throws Exception {
     Connector c = getConnector();
     c.tableOperations().create("test_ingest");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6a88722c/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 d477e2f..79b3255 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
@@ -58,7 +58,7 @@ public class SslWithClientAuthIT extends SslIT {
   }
 
   @Override
-  @Test(timeout = 120000)
+  @Test(timeout = 4 * 60 * 1000)
   public void bulk() throws Exception {
     super.bulk();
   }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6a88722c/test/src/test/java/org/apache/accumulo/test/functional/StartIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/StartIT.java b/test/src/test/java/org/apache/accumulo/test/functional/StartIT.java
index cdc3f49..dff47c4 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/StartIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/StartIT.java
@@ -24,7 +24,7 @@ import org.junit.Test;
 
 public class StartIT extends ConfigurableMacIT {
 
-  @Test(timeout = 15 * 1000)
+  @Test(timeout = 30 * 1000)
   public void test() throws Exception {
     assertTrue(exec(TestMain.class, "exception").waitFor() != 0);
     assertEquals(0, exec(TestMain.class, "success").waitFor());


Mime
View raw message