Updated Branches: refs/heads/cassandra-2.0 2cb95d698 -> 1bad5ed9f refs/heads/trunk 1141b82d6 -> ea72d69c8
close corrupt summary stream before trying to delete it patch by Mikhail Stepura; reviewed by jbellis for CASSANDRA-6380 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1bad5ed9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1bad5ed9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1bad5ed9 Branch: refs/heads/cassandra-2.0 Commit: 1bad5ed9f7e159f93ffa68d27dc1b9e8674b4f8a Parents: 2cb95d6 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Nov 20 07:26:20 2013 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Nov 20 07:26:20 2013 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/io/sstable/SSTableReader.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1bad5ed9/src/java/org/apache/cassandra/io/sstable/SSTableReader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java index 10ac36c..c8e2c35 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java @@ -542,6 +542,7 @@ public class SSTableReader extends SSTable implements Closeable { logger.debug("Cannot deserialize SSTable Summary: ", e); // corrupted; delete it and fall back to creating a new summary + FileUtils.closeQuietly(iStream); FileUtils.deleteWithConfirm(summariesFile); return false; }