Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 8D1C1200C62 for ; Wed, 26 Apr 2017 09:44:50 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 8BDB1160BBC; Wed, 26 Apr 2017 07:44:50 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id D815D160BBB for ; Wed, 26 Apr 2017 09:44:49 +0200 (CEST) Received: (qmail 91975 invoked by uid 500); 26 Apr 2017 07:44:48 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 91456 invoked by uid 99); 26 Apr 2017 07:44:48 -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; Wed, 26 Apr 2017 07:44:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 22A2EE1864; Wed, 26 Apr 2017 07:44:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: marcuse@apache.org To: commits@cassandra.apache.org Date: Wed, 26 Apr 2017 07:44:51 -0000 Message-Id: In-Reply-To: <4452d76b66664185927632eea589680a@git.apache.org> References: <4452d76b66664185927632eea589680a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [04/10] cassandra git commit: Fix NeverPurgeTest - wait for compactions to finish archived-at: Wed, 26 Apr 2017 07:44:50 -0000 Fix NeverPurgeTest - wait for compactions to finish Patch by marcuse; reviewed by Stefania for CASSANDRA-12841 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bd540bc5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bd540bc5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bd540bc5 Branch: refs/heads/trunk Commit: bd540bc51fa4d308a23a0f67ec9d65ebeeb72ee5 Parents: cba5c7f Author: Marcus Eriksson Authored: Wed Nov 9 09:46:53 2016 +0100 Committer: Marcus Eriksson Committed: Wed Apr 26 09:36:32 2017 +0200 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/db/compaction/NeverPurgeTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bd540bc5/test/unit/org/apache/cassandra/db/compaction/NeverPurgeTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/compaction/NeverPurgeTest.java b/test/unit/org/apache/cassandra/db/compaction/NeverPurgeTest.java index 5211065..362afe7 100644 --- a/test/unit/org/apache/cassandra/db/compaction/NeverPurgeTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/NeverPurgeTest.java @@ -80,7 +80,7 @@ public class NeverPurgeTest extends CQLTester execute("DELETE FROM %s WHERE a=3"); cfs.forceBlockingFlush(); cfs.enableAutoCompaction(); - while (cfs.getSSTables().size() > 1) + while (cfs.getSSTables().size() > 1 || !cfs.getTracker().getCompacting().isEmpty()) Thread.sleep(100); verifyContainsTombstones(cfs.getSSTables(), 3); }