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 2016/04/11 19:54:43 UTC
[1/3] accumulo git commit: ACCUMULO-4185 Use SYNC durability and
expect the update to be durable
Repository: accumulo
Updated Branches:
refs/heads/1.7 0cb15fa30 -> 0f6e5ed55
refs/heads/master 35252694b -> 25b99c258
ACCUMULO-4185 Use SYNC durability and expect the update to be durable
Using LOG is subject to race conditions with RawLocalFileSystem. It
is possible that we see or don't see the update which is bad for a
test. Using SYNC removes that race condition.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0f6e5ed5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0f6e5ed5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0f6e5ed5
Branch: refs/heads/1.7
Commit: 0f6e5ed5549132e8d63153fa9a0b9fa10779b264
Parents: 0cb15fa
Author: Josh Elser <el...@apache.org>
Authored: Mon Apr 11 13:52:49 2016 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Mon Apr 11 13:52:49 2016 -0400
----------------------------------------------------------------------
.../test/java/org/apache/accumulo/proxy/ProxyDurabilityIT.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0f6e5ed5/test/src/test/java/org/apache/accumulo/proxy/ProxyDurabilityIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/proxy/ProxyDurabilityIT.java b/test/src/test/java/org/apache/accumulo/proxy/ProxyDurabilityIT.java
index 6338e00..b388cbf 100644
--- a/test/src/test/java/org/apache/accumulo/proxy/ProxyDurabilityIT.java
+++ b/test/src/test/java/org/apache/accumulo/proxy/ProxyDurabilityIT.java
@@ -111,7 +111,7 @@ public class ProxyDurabilityIT extends ConfigurableMacIT {
assertEquals(0, count(tableName));
ConditionalWriterOptions cfg = new ConditionalWriterOptions();
- cfg.setDurability(Durability.LOG);
+ cfg.setDurability(Durability.SYNC);
String cwriter = client.createConditionalWriter(login, tableName, cfg);
ConditionalUpdates updates = new ConditionalUpdates();
updates.addToConditions(new Condition(new Column(bytes("cf"), bytes("cq"), bytes(""))));
@@ -120,7 +120,7 @@ public class ProxyDurabilityIT extends ConfigurableMacIT {
assertEquals(ConditionalStatus.ACCEPTED, status.get(bytes("row")));
assertEquals(1, count(tableName));
restartTServer();
- assertEquals(0, count(tableName));
+ assertEquals(1, count(tableName));
proxyServer.stop();
}
[3/3] accumulo git commit: Merge branch '1.7'
Posted by el...@apache.org.
Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/25b99c25
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/25b99c25
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/25b99c25
Branch: refs/heads/master
Commit: 25b99c258be3768d144338548d1f14aeed4b8767
Parents: 3525269 0f6e5ed
Author: Josh Elser <el...@apache.org>
Authored: Mon Apr 11 13:54:11 2016 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Mon Apr 11 13:54:11 2016 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/3] accumulo git commit: ACCUMULO-4185 Use SYNC durability and
expect the update to be durable
Posted by el...@apache.org.
ACCUMULO-4185 Use SYNC durability and expect the update to be durable
Using LOG is subject to race conditions with RawLocalFileSystem. It
is possible that we see or don't see the update which is bad for a
test. Using SYNC removes that race condition.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0f6e5ed5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0f6e5ed5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0f6e5ed5
Branch: refs/heads/master
Commit: 0f6e5ed5549132e8d63153fa9a0b9fa10779b264
Parents: 0cb15fa
Author: Josh Elser <el...@apache.org>
Authored: Mon Apr 11 13:52:49 2016 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Mon Apr 11 13:52:49 2016 -0400
----------------------------------------------------------------------
.../test/java/org/apache/accumulo/proxy/ProxyDurabilityIT.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0f6e5ed5/test/src/test/java/org/apache/accumulo/proxy/ProxyDurabilityIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/proxy/ProxyDurabilityIT.java b/test/src/test/java/org/apache/accumulo/proxy/ProxyDurabilityIT.java
index 6338e00..b388cbf 100644
--- a/test/src/test/java/org/apache/accumulo/proxy/ProxyDurabilityIT.java
+++ b/test/src/test/java/org/apache/accumulo/proxy/ProxyDurabilityIT.java
@@ -111,7 +111,7 @@ public class ProxyDurabilityIT extends ConfigurableMacIT {
assertEquals(0, count(tableName));
ConditionalWriterOptions cfg = new ConditionalWriterOptions();
- cfg.setDurability(Durability.LOG);
+ cfg.setDurability(Durability.SYNC);
String cwriter = client.createConditionalWriter(login, tableName, cfg);
ConditionalUpdates updates = new ConditionalUpdates();
updates.addToConditions(new Condition(new Column(bytes("cf"), bytes("cq"), bytes(""))));
@@ -120,7 +120,7 @@ public class ProxyDurabilityIT extends ConfigurableMacIT {
assertEquals(ConditionalStatus.ACCEPTED, status.get(bytes("row")));
assertEquals(1, count(tableName));
restartTServer();
- assertEquals(0, count(tableName));
+ assertEquals(1, count(tableName));
proxyServer.stop();
}