Pass root cause to CorruptBlockException when uncompression failed patch by yukim; reviewed by Paulo Motta for CASSANDRA-12889
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c39a9b08 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c39a9b08 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c39a9b08 Branch: refs/heads/cassandra-3.X Commit: c39a9b08d94ebcb22e6f4e400fc79f169564b3ce Parents: 9d90b4e Author: Yuki Morishita <yu...@apache.org> Authored: Wed Nov 9 11:43:10 2016 -0600 Committer: Yuki Morishita <yu...@apache.org> Committed: Thu Nov 10 09:30:09 2016 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/io/compress/CompressedRandomAccessReader.java | 4 ++-- .../apache/cassandra/io/compress/CompressedSequentialWriter.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c39a9b08/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 8f0e201..9598546 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.0.11 + * Pass root cause to CorruptBlockException when uncompression failed (CASSANDRA-12889) * Fix partition count log during compaction (CASSANDRA-12184) http://git-wip-us.apache.org/repos/asf/cassandra/blob/c39a9b08/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java b/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java index 329d932..0624e89 100644 --- a/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java +++ b/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java @@ -122,7 +122,7 @@ public class CompressedRandomAccessReader extends RandomAccessReader } catch (IOException e) { - throw new CorruptBlockException(getPath(), chunk); + throw new CorruptBlockException(getPath(), chunk, e); } finally { @@ -184,7 +184,7 @@ public class CompressedRandomAccessReader extends RandomAccessReader } catch (IOException e) { - throw new CorruptBlockException(getPath(), chunk); + throw new CorruptBlockException(getPath(), chunk, e); } finally { http://git-wip-us.apache.org/repos/asf/cassandra/blob/c39a9b08/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java b/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java index 9bd1145..74258cf 100644 --- a/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java +++ b/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java @@ -203,7 +203,7 @@ public class CompressedSequentialWriter extends SequentialWriter } catch (IOException e) { - throw new CorruptBlockException(getPath(), chunkOffset, chunkSize); + throw new CorruptBlockException(getPath(), chunkOffset, chunkSize, e); } CRC32 checksum = new CRC32();
