You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2015/04/23 16:32:55 UTC
[09/11] accumulo git commit: ACCUMULO-3488 recompile
TestCompactionStrat.jar
ACCUMULO-3488 recompile TestCompactionStrat.jar
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b7311940
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b7311940
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b7311940
Branch: refs/heads/1.7
Commit: b7311940da2ea91f5a3554044f39d219e4e0c2d7
Parents: 312b876
Author: Eric Newton <er...@gmail.com>
Authored: Thu Apr 23 10:22:51 2015 -0400
Committer: Eric Newton <er...@gmail.com>
Committed: Thu Apr 23 10:22:51 2015 -0400
----------------------------------------------------------------------
.../apache/accumulo/proxy/SimpleProxyBase.java | 26 +++++++++++++++----
test/src/test/resources/TestCompactionStrat.jar | Bin 1681 -> 2259 bytes
2 files changed, 21 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b7311940/test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java b/test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java
index d124ce9..8aed78a 100644
--- a/test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java
+++ b/test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java
@@ -116,6 +116,11 @@ import com.google.common.net.HostAndPort;
*/
public abstract class SimpleProxyBase extends SharedMiniClusterIT {
+ @Override
+ protected int defaultTimeoutSeconds() {
+ return 10*60;
+ }
+
private static final long ZOOKEEPER_PROPAGATION_TIME = 10 * 1000;
private TServer proxyServer;
private int proxyPort;
@@ -1033,10 +1038,14 @@ public abstract class SimpleProxyBase extends SharedMiniClusterIT {
client.updateAndFlush(creds, TABLE_TEST, mutation("row1", "cf", "cq", "123"));
- try {
- client.updateAndFlush(creds, TABLE_TEST, mutation("row1", "cf", "cq", "x"));
- fail("constraint did not fire");
- } catch (MutationsRejectedException ex) {}
+ while (true) {
+ try {
+ client.updateAndFlush(creds, TABLE_TEST, mutation("row1", "cf", "cq", "x"));
+ UtilWaitThread.sleep(1000);
+ } catch (MutationsRejectedException ex) {
+ break;
+ }
+ }
client.removeConstraint(creds, TABLE_TEST, 2);
@@ -1044,7 +1053,14 @@ public abstract class SimpleProxyBase extends SharedMiniClusterIT {
assertEquals(1, client.listConstraints(creds, TABLE_TEST).size());
- client.updateAndFlush(creds, TABLE_TEST, mutation("row1", "cf", "cq", "x"));
+ while (true) {
+ try {
+ client.updateAndFlush(creds, TABLE_TEST, mutation("row1", "cf", "cq", "x"));
+ break;
+ } catch (MutationsRejectedException ex) {
+ UtilWaitThread.sleep(1000);
+ }
+ }
assertScan(new String[][] {{"row1", "cf", "cq", "x"}}, TABLE_TEST);
// splits, merge
client.addSplits(creds, TABLE_TEST, new HashSet<ByteBuffer>(Arrays.asList(s2bb("a"), s2bb("m"), s2bb("z"))));
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b7311940/test/src/test/resources/TestCompactionStrat.jar
----------------------------------------------------------------------
diff --git a/test/src/test/resources/TestCompactionStrat.jar b/test/src/test/resources/TestCompactionStrat.jar
index 0bc38d4..a28cf7a 100644
Binary files a/test/src/test/resources/TestCompactionStrat.jar and b/test/src/test/resources/TestCompactionStrat.jar differ