Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fa36044a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fa36044a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fa36044a Branch: refs/heads/trunk Commit: fa36044a585d2268d6dd61603f3fb21e6b8ec286 Parents: 733ea88 3f5f702 Author: Jeff Jirsa <[email protected]> Authored: Tue Sep 5 11:48:04 2017 -0700 Committer: Jeff Jirsa <[email protected]> Committed: Tue Sep 5 11:48:40 2017 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/commitlog/CommitLogReader.java | 3 ++- .../apache/cassandra/db/commitlog/CommitLogTest.java | 12 +++++++++++- 3 files changed, 14 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fa36044a/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fa36044a/src/java/org/apache/cassandra/db/commitlog/CommitLogReader.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/commitlog/CommitLogReader.java index 301c832,8c04329..864325b --- a/src/java/org/apache/cassandra/db/commitlog/CommitLogReader.java +++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogReader.java @@@ -147,6 -149,7 +147,7 @@@ public class CommitLogReade if (desc == null) { // don't care about whether or not the handler thinks we can continue. We can't w/out descriptor. - // whether or not we continue with startup will depend on whether this is the last segment ++ // whether or not we can continue depends on whether this is the last segment handler.handleUnrecoverableError(new CommitLogReadException( String.format("Could not read commit log descriptor in file %s", file), CommitLogReadErrorReason.UNRECOVERABLE_DESCRIPTOR_ERROR, http://git-wip-us.apache.org/repos/asf/cassandra/blob/fa36044a/test/unit/org/apache/cassandra/db/commitlog/CommitLogTest.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/db/commitlog/CommitLogTest.java index f98dd6b,aab55a5..956a05d --- a/test/unit/org/apache/cassandra/db/commitlog/CommitLogTest.java +++ b/test/unit/org/apache/cassandra/db/commitlog/CommitLogTest.java @@@ -153,9 -155,22 +156,16 @@@ public class CommitLogTes } @Test - public void testRecoveryWithFinalEmptyLog() throws Exception ++ public void testRecoveryWithEmptyFinalLog() throws Exception + { - // Even though it's empty, it's the last commitlog segment, so allowTruncation=true should allow it to pass - CommitLog.instance.recoverFiles(new File[]{tmpFile(CommitLogDescriptor.current_version)}); ++ CommitLog.instance.recoverFiles(tmpFile(CommitLogDescriptor.current_version)); + } + - @Test - public void testRecoveryWithEmptyLog20() throws Exception - { - CommitLog.instance.recoverFiles(tmpFile(CommitLogDescriptor.VERSION_20)); - } + + @Test public void testRecoveryWithZeroLog() throws Exception { - testRecovery(new byte[10], null); + testRecovery(new byte[10], CommitLogReplayException.class); } @Test --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
