Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 4223aad66 -> 26c204978 refs/heads/trunk 370e72d0f -> e58a40e52
Fix SSTableRewriter cleanup patch by benedict; reviewed by josh for CASSANDRA-8802 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/26c20497 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/26c20497 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/26c20497 Branch: refs/heads/cassandra-2.1 Commit: 26c2049783e5a680b125eea61f098f19549a820e Parents: 4223aad Author: Benedict Elliott Smith <[email protected]> Authored: Fri Feb 13 20:50:31 2015 +0000 Committer: Benedict Elliott Smith <[email protected]> Committed: Fri Feb 13 20:50:31 2015 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/26c20497/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 0d204a5..a35fa42 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.1.4 + * Fix SSTableRewriter cleanup (CASSANDRA-8802) * Introduce SafeMemory for CompressionMetadata.Writer (CASSANDRA-8758) * 'nodetool info' prints exception against older node (CASSANDRA-8796) * Ensure SSTableReader.last corresponds exactly with the file end (CASSANDRA-8750) http://git-wip-us.apache.org/repos/asf/cassandra/blob/26c20497/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java b/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java index e6e4343..2ca3e6f 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableRewriter.java @@ -370,7 +370,7 @@ public class SSTableRewriter while (!finishedEarly.isEmpty()) { - Finished f = finishedEarly.poll(); + Finished f = finishedEarly.peek(); if (f.writer.getFilePointer() > 0) { if (f.reader != null) @@ -389,6 +389,7 @@ public class SSTableRewriter f.writer.abort(); assert f.reader == null; } + finishedEarly.poll(); } if (throwLate)
