cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marc...@apache.org
Subject [1/2] cassandra git commit: Release the self ref when opening snapshot sstable readers
Date Fri, 07 Aug 2015 06:29:33 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 ed4fad19e -> bf08e663b


Release the self ref when opening snapshot sstable readers

Patch by marcuse; reviewed by benedict for CASSANDRA-9998


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e9b975c2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e9b975c2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e9b975c2

Branch: refs/heads/cassandra-2.2
Commit: e9b975c279578fe2d6f25368fe2839e1d0572371
Parents: e1bb792
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Thu Aug 6 15:22:50 2015 +0200
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Fri Aug 7 08:20:06 2015 +0200

----------------------------------------------------------------------
 CHANGES.txt                                             | 1 +
 src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9b975c2/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9a475ea..75bdcde 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.9
+ * Release snapshot selfRef when doing snapshot repair (CASSANDRA-9998)
  * Cannot replace token does not exist - DN node removed as Fat Client (CASSANDRA-9871)
  * Fix handling of enable/disable autocompaction (CASSANDRA-9899)
  * Commit log segment recycling is disabled by default (CASSANDRA-9896)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9b975c2/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index ad66f8e..6777e7a 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -2355,8 +2355,9 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
                         logger.debug("using snapshot sstable {}", entries.getKey());
                     // open without tracking hotness
                     sstable = SSTableReader.open(entries.getKey(), entries.getValue(), metadata,
partitioner, true, false);
-                    // This is technically not necessary since it's a snapshot but makes
things easier
                     refs.tryRef(sstable);
+                    // release the self ref as we never add the snapshot sstable to DataTracker
where it is otherwise released
+                    sstable.selfRef().release();
                 }
                 else if (logger.isDebugEnabled())
                 {


Mime
View raw message