accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [1/3] git commit: ACCUMULO-3113 Increase the timeouts in testTimeout
Date Fri, 12 Sep 2014 08:01:46 GMT
Repository: accumulo
Updated Branches:
  refs/heads/1.6.1-SNAPSHOT d54e0fd86 -> 2519b838e
  refs/heads/master 6b5275e1b -> 25ab9c645


ACCUMULO-3113 Increase the timeouts in testTimeout

Formatting also got fixed by eclipse. Should help stabilize
some failures that I was seeing from this test. It appears that
1 second was slightly too fast in some cases to get the cond mutation
committed.


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

Branch: refs/heads/1.6.1-SNAPSHOT
Commit: 2519b838e97e19bced5b24af841f2a8d54eeb42c
Parents: d54e0fd
Author: Josh Elser <elserj@apache.org>
Authored: Thu Sep 11 17:50:15 2014 -0700
Committer: Josh Elser <elserj@apache.org>
Committed: Fri Sep 12 00:47:04 2014 -0700

----------------------------------------------------------------------
 .../apache/accumulo/test/ConditionalWriterIT.java | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/2519b838/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java b/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
index 477f492..a24ff9e 100644
--- a/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
@@ -17,7 +17,7 @@
 
 package org.apache.accumulo.test;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -86,7 +86,7 @@ import org.junit.Assert;
 import org.junit.Test;
 
 /**
- * 
+ *
  */
 public class ConditionalWriterIT extends SimpleMacIT {
 
@@ -96,7 +96,7 @@ public class ConditionalWriterIT extends SimpleMacIT {
   }
 
   public static long abs(long l) {
-    l = Math.abs(l);  // abs(Long.MIN_VALUE) == Long.MIN_VALUE... 
+    l = Math.abs(l);  // abs(Long.MIN_VALUE) == Long.MIN_VALUE...
     if (l < 0)
       return 0;
     return l;
@@ -111,7 +111,7 @@ public class ConditionalWriterIT extends SimpleMacIT {
     conn.tableOperations().create(tableName);
 
     ConditionalWriter cw = conn.createConditionalWriter(tableName, new ConditionalWriterConfig());
-    
+
     // mutation conditional on column tx:seq not existing
     ConditionalMutation cm0 = new ConditionalMutation("99006", new Condition("tx", "seq"));
     cm0.put("name", "last", "doe");
@@ -1058,7 +1058,7 @@ public class ConditionalWriterIT extends SimpleMacIT {
 
     conn.tableOperations().create(table);
 
-    ConditionalWriter cw = conn.createConditionalWriter(table, new ConditionalWriterConfig().setTimeout(1,
TimeUnit.SECONDS));
+    ConditionalWriter cw = conn.createConditionalWriter(table, new ConditionalWriterConfig().setTimeout(3,
TimeUnit.SECONDS));
 
     ConditionalMutation cm1 = new ConditionalMutation("r1", new Condition("tx", "seq"));
     cm1.put("tx", "seq", "1");
@@ -1067,7 +1067,7 @@ public class ConditionalWriterIT extends SimpleMacIT {
     Assert.assertEquals(cw.write(cm1).getStatus(), Status.ACCEPTED);
 
     IteratorSetting is = new IteratorSetting(5, SlowIterator.class);
-    SlowIterator.setSeekSleepTime(is, 1500);
+    SlowIterator.setSeekSleepTime(is, 5000);
 
     ConditionalMutation cm2 = new ConditionalMutation("r1", new Condition("tx", "seq").setValue("1").setIterators(is));
     cm2.put("tx", "seq", "2");
@@ -1203,7 +1203,7 @@ public class ConditionalWriterIT extends SimpleMacIT {
 
     cw.write(cm1);
   }
-  
+
   @Test
   public void testTrace() throws Exception {
 
@@ -1215,7 +1215,7 @@ public class ConditionalWriterIT extends SimpleMacIT {
     while (!conn.tableOperations().exists("trace")) {
       UtilWaitThread.sleep(1000);
     }
-    
+
     String tableName = getUniqueNames(1)[0];
     conn.tableOperations().create(tableName);
     conn.tableOperations().deleteRows("trace", null, null);
@@ -1231,7 +1231,7 @@ public class ConditionalWriterIT extends SimpleMacIT {
     cm0.put("tx", "seq", "1");
     Assert.assertEquals(Status.ACCEPTED, cw.write(cm0).getStatus());
     root.stop();
-    
+
     final Scanner scanner = conn.createScanner("trace", Authorizations.EMPTY);
     scanner.setRange(new Range(new Text(Long.toHexString(root.traceId()))));
     while (true) {


Mime
View raw message