Repository: cassandra Updated Branches: refs/heads/trunk e87008bb9 -> d9fcb3974
Followup for CASSANDRA-9104 - remove redundant recover calls in tests Patch by jmckenzie; reviewed by branimir for CASSANDRA-9104 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d9fcb397 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d9fcb397 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d9fcb397 Branch: refs/heads/trunk Commit: d9fcb397478aa1a2bf8c03a551c0ea65de83a33c Parents: e87008b Author: Josh McKenzie <josh.mcken...@datastax.com> Authored: Fri Apr 24 15:53:21 2015 -0500 Committer: Josh McKenzie <josh.mcken...@datastax.com> Committed: Fri Apr 24 15:53:21 2015 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/commitlog/CommitLog.java | 2 ++ .../apache/cassandra/db/commitlog/CommitLogSegmentManager.java | 2 +- test/unit/org/apache/cassandra/db/RecoveryManager3Test.java | 1 - test/unit/org/apache/cassandra/db/RecoveryManagerTest.java | 5 ----- .../org/apache/cassandra/db/RecoveryManagerTruncateTest.java | 1 - 5 files changed, 3 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d9fcb397/src/java/org/apache/cassandra/db/commitlog/CommitLog.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLog.java b/src/java/org/apache/cassandra/db/commitlog/CommitLog.java index b1670ac..37a709c 100644 --- a/src/java/org/apache/cassandra/db/commitlog/CommitLog.java +++ b/src/java/org/apache/cassandra/db/commitlog/CommitLog.java @@ -119,6 +119,8 @@ public class CommitLog implements CommitLogMBean */ public int recover() throws IOException { + assert !allocator.createReserveSegments; + // Allocator could be in the process of initial startup with 0 active and available segments. We need to wait for // the allocation manager to finish allocation and add it to available segments so we don't get an invalid response // on allocator.manages(...) below by grabbing a file off the filesystem before it's added to the CLQ. http://git-wip-us.apache.org/repos/asf/cassandra/blob/d9fcb397/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManager.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManager.java index ac36d34..5a9e375 100644 --- a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManager.java +++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManager.java @@ -89,7 +89,7 @@ public class CommitLogSegmentManager * New segment creation is initially disabled because we'll typically get some "free" segments * recycled after log replay. */ - private volatile boolean createReserveSegments = false; + volatile boolean createReserveSegments = false; private Thread managerThread; private volatile boolean run = true; http://git-wip-us.apache.org/repos/asf/cassandra/blob/d9fcb397/test/unit/org/apache/cassandra/db/RecoveryManager3Test.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/RecoveryManager3Test.java b/test/unit/org/apache/cassandra/db/RecoveryManager3Test.java index 75946fd..a94d94d 100644 --- a/test/unit/org/apache/cassandra/db/RecoveryManager3Test.java +++ b/test/unit/org/apache/cassandra/db/RecoveryManager3Test.java @@ -92,7 +92,6 @@ public class RecoveryManager3Test } CommitLog.instance.resetUnsafe(false); // disassociate segments from live CL - CommitLog.instance.recover(); assertColumns(Util.getColumnFamily(keyspace1, dk, "Standard1"), "col1"); assertColumns(Util.getColumnFamily(keyspace2, dk, "Standard3"), "col2"); http://git-wip-us.apache.org/repos/asf/cassandra/blob/d9fcb397/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java b/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java index 3384e4b..c9abe0d 100644 --- a/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java +++ b/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java @@ -72,7 +72,6 @@ public class RecoveryManagerTest public void testNothingToRecover() throws IOException { CommitLog.instance.resetUnsafe(true); - CommitLog.instance.recover(); } @Test @@ -100,7 +99,6 @@ public class RecoveryManagerTest keyspace2.getColumnFamilyStore("Standard3").clearUnsafe(); CommitLog.instance.resetUnsafe(false); // disassociate segments from live CL - CommitLog.instance.recover(); assertColumns(Util.getColumnFamily(keyspace1, dk, "Standard1"), "col1"); assertColumns(Util.getColumnFamily(keyspace2, dk, "Standard3"), "col2"); @@ -127,7 +125,6 @@ public class RecoveryManagerTest keyspace1.getColumnFamilyStore("Counter1").clearUnsafe(); CommitLog.instance.resetUnsafe(false); // disassociate segments from live CL - CommitLog.instance.recover(); cf = Util.getColumnFamily(keyspace1, dk, "Counter1"); @@ -157,7 +154,6 @@ public class RecoveryManagerTest } keyspace1.getColumnFamilyStore("Standard1").clearUnsafe(); CommitLog.instance.resetUnsafe(false); // disassociate segments from live CL - CommitLog.instance.recover(); ColumnFamily cf = Util.getColumnFamily(keyspace1, dk, "Standard1"); Assert.assertEquals(6, cf.getColumnCount()); @@ -194,7 +190,6 @@ public class RecoveryManagerTest keyspace1.getColumnFamilyStore("Standard1").clearUnsafe(); CommitLog.instance.resetUnsafe(false); // disassociate segments from live CL - CommitLog.instance.recover(); cf = Util.getColumnFamily(keyspace1, dk, "Standard1"); Assert.assertEquals(2, cf.getColumnCount()); http://git-wip-us.apache.org/repos/asf/cassandra/blob/d9fcb397/test/unit/org/apache/cassandra/db/RecoveryManagerTruncateTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/RecoveryManagerTruncateTest.java b/test/unit/org/apache/cassandra/db/RecoveryManagerTruncateTest.java index 32d51d8..cef5914 100644 --- a/test/unit/org/apache/cassandra/db/RecoveryManagerTruncateTest.java +++ b/test/unit/org/apache/cassandra/db/RecoveryManagerTruncateTest.java @@ -73,7 +73,6 @@ public class RecoveryManagerTruncateTest // and now truncate it cfs.truncateBlocking(); CommitLog.instance.resetUnsafe(false); - CommitLog.instance.recover(); // and validate truncation. assertNull(getFromTable(keyspace, "Standard1", "keymulti", "col1"));
