Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-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 79DB317592 for ; Tue, 3 Mar 2015 23:15:17 +0000 (UTC) Received: (qmail 19476 invoked by uid 500); 3 Mar 2015 23:14:42 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 19400 invoked by uid 500); 3 Mar 2015 23:14:42 -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 19260 invoked by uid 99); 3 Mar 2015 23:14:42 -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; Tue, 03 Mar 2015 23:14:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 59457E0FBC; Tue, 3 Mar 2015 23:14:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yukim@apache.org To: commits@cassandra.apache.org Date: Tue, 03 Mar 2015 23:14:45 -0000 Message-Id: <59948fe9925b47b6b62b7ea624a22e9b@git.apache.org> In-Reply-To: <71fc60e4d149438da949ed606b75da6d@git.apache.org> References: <71fc60e4d149438da949ed606b75da6d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/5] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1 Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2d1e46e4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2d1e46e4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2d1e46e4 Branch: refs/heads/cassandra-2.1 Commit: 2d1e46e40a2c9205ab42ebe5bddfd2bc3837f719 Parents: bef1d0c e7d802e Author: Yuki Morishita Authored: Tue Mar 3 17:13:06 2015 -0600 Committer: Yuki Morishita Committed: Tue Mar 3 17:13:06 2015 -0600 ---------------------------------------------------------------------- .../cassandra/db/compaction/LongCompactionsTest.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d1e46e4/test/long/org/apache/cassandra/db/compaction/LongCompactionsTest.java ---------------------------------------------------------------------- diff --cc test/long/org/apache/cassandra/db/compaction/LongCompactionsTest.java index 94bc09f,a21cee5..e87e336 --- a/test/long/org/apache/cassandra/db/compaction/LongCompactionsTest.java +++ b/test/long/org/apache/cassandra/db/compaction/LongCompactionsTest.java @@@ -99,7 -108,8 +108,8 @@@ public class LongCompactionsTest extend long start = System.nanoTime(); final int gcBefore = (int) (System.currentTimeMillis() / 1000) - Schema.instance.getCFMetaData(KEYSPACE1, "Standard1").getGcGraceSeconds(); + assert store.getDataTracker().markCompacting(sstables): "Cannot markCompacting all sstables"; - new CompactionTask(store, sstables, gcBefore).execute(null); + new CompactionTask(store, sstables, gcBefore, false).execute(null); System.out.println(String.format("%s: sstables=%d rowsper=%d colsper=%d: %d ms", this.getClass().getName(), sstableCount,