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/09/12 10:01:46 UTC
[1/3] git commit: ACCUMULO-3113 Increase the timeouts in testTimeout
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 <el...@apache.org>
Authored: Thu Sep 11 17:50:15 2014 -0700
Committer: Josh Elser <el...@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) {
[3/3] 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/25ab9c64
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/25ab9c64
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/25ab9c64
Branch: refs/heads/master
Commit: 25ab9c645ba0b62908077feff2dba3a0ddb92582
Parents: 6b5275e 2519b83
Author: Josh Elser <el...@apache.org>
Authored: Fri Sep 12 00:47:50 2014 -0700
Committer: Josh Elser <el...@apache.org>
Committed: Fri Sep 12 00:47:50 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/25ab9c64/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
----------------------------------------------------------------------
[2/3] git commit: ACCUMULO-3113 Increase the timeouts in testTimeout
Posted by el...@apache.org.
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/master
Commit: 2519b838e97e19bced5b24af841f2a8d54eeb42c
Parents: d54e0fd
Author: Josh Elser <el...@apache.org>
Authored: Thu Sep 11 17:50:15 2014 -0700
Committer: Josh Elser <el...@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) {