You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2012/10/18 22:20:30 UTC
[5/6] git commit: add a close() method to CRAR to prevent leaking
file descriptors patch by Pavel Yaskevich;
reviewed by Jonathan Ellis for CASSANDRA-4820
add a close() method to CRAR to prevent leaking file descriptors
patch by Pavel Yaskevich; reviewed by Jonathan Ellis for CASSANDRA-4820
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ffbcb4b1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ffbcb4b1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ffbcb4b1
Branch: refs/heads/trunk
Commit: ffbcb4b11b40c52253b02098ca0225b9cf426cd2
Parents: 4d637f1
Author: Pavel Yaskevich <py...@twitter.com>
Authored: Wed Oct 17 11:06:28 2012 -0700
Committer: Pavel Yaskevich <py...@twitter.com>
Committed: Wed Oct 17 11:07:56 2012 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../io/compress/CompressedRandomAccessReader.java | 7 +++++++
2 files changed, 8 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ffbcb4b1/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index f243c74..36b4758 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,6 @@
1.1.7
* fix wrong leveled compaction progress calculation (CASSANDRA-4807)
+ * add a close() method to CRAR to prevent leaking file descriptors (CASSANDRA-4820)
1.1.6
* Wait for writes on synchronous read digest mismatch (CASSANDRA-4792)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ffbcb4b1/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 c83fd90..5403120 100644
--- a/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java
+++ b/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java
@@ -125,6 +125,13 @@ public class CompressedRandomAccessReader extends RandomAccessReader
}
@Override
+ public void close() throws IOException
+ {
+ super.close();
+ source.close();
+ }
+
+ @Override
public String toString()
{
return String.format("%s - chunk length %d, data length %d.", getPath(), metadata.chunkLength(), metadata.dataLength);