Return-Path: X-Original-To: apmail-accumulo-commits-archive@www.apache.org Delivered-To: apmail-accumulo-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C491019BD3 for ; Mon, 11 Apr 2016 17:54:43 +0000 (UTC) Received: (qmail 56352 invoked by uid 500); 11 Apr 2016 17:54:43 -0000 Delivered-To: apmail-accumulo-commits-archive@accumulo.apache.org Received: (qmail 56269 invoked by uid 500); 11 Apr 2016 17:54:43 -0000 Mailing-List: contact commits-help@accumulo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@accumulo.apache.org Delivered-To: mailing list commits@accumulo.apache.org Received: (qmail 56189 invoked by uid 99); 11 Apr 2016 17:54:43 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Apr 2016 17:54:43 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7363BDFA6F; Mon, 11 Apr 2016 17:54:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: elserj@apache.org To: commits@accumulo.apache.org Date: Mon, 11 Apr 2016 17:54:43 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [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 Authored: Mon Apr 11 13:52:49 2016 -0400 Committer: Josh Elser 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(); }