Repository: cassandra Updated Branches: refs/heads/trunk 0b324c5e5 -> 24a189ca6
Fix version check on CommitLogArchiver restore Patch by jmckenzie; reviewed by Sam Tunnicliffe for CASSANDRA-8293 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/24a189ca Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/24a189ca Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/24a189ca Branch: refs/heads/trunk Commit: 24a189ca6d2279f67ce88c28aeee5a2683ff8fbb Parents: 0b324c5 Author: Joshua McKenzie <jmcken...@apache.org> Authored: Fri Jan 30 11:52:17 2015 -0600 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Fri Jan 30 11:52:17 2015 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/24a189ca/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java index 6cba603..26468d4 100644 --- a/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java +++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java @@ -211,7 +211,7 @@ public class CommitLogArchiver descriptor = fromHeader; else descriptor = fromName; - if (descriptor.version > CommitLogDescriptor.VERSION_21) + if (descriptor.version > CommitLogDescriptor.VERSION_30) throw new IllegalStateException("Unsupported commit log version: " + descriptor.version); File toFile = new File(DatabaseDescriptor.getCommitLogLocation(), descriptor.fileName());