cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yu...@apache.org
Subject [7/7] git commit: backport CASSANDRA-6011
Date Fri, 13 Sep 2013 16:41:22 GMT
backport CASSANDRA-6011


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

Branch: refs/heads/cassandra-1.1
Commit: cec564d22ff0007e5dbc64085df63668ad90c689
Parents: eb884a5
Author: Yuki Morishita <yukim@apache.org>
Authored: Fri Sep 13 11:24:58 2013 -0500
Committer: Yuki Morishita <yukim@apache.org>
Committed: Fri Sep 13 11:40:44 2013 -0500

----------------------------------------------------------------------
 CHANGES.txt                                                    | 1 +
 .../org/apache/cassandra/db/compaction/CompactionManager.java  | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/cec564d2/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 8790518..52f1b18 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,7 @@
 1.1.next
  * Backport compaction exception handling from 1.2
  * Correctly validate sparse composite cells in scrub (CASSANDRA-5855)
+ * Fix snapshots in use get deleted during snapshot repair (CASSANDRA-6011)
 
 
 1.1.12

http://git-wip-us.apache.org/repos/asf/cassandra/blob/cec564d2/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index b6f96b6..9dc3bff 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@ -688,7 +688,7 @@ public class CompactionManager implements CompactionManagerMBean
             return;
 
         Collection<SSTableReader> sstables;
-        if (cfs.table.snapshotExists(validator.request.sessionid))
+        if (cfs.snapshotExists(validator.request.sessionid))
         {
             // If there is a snapshot created for the session then read from there.
             sstables = cfs.getSnapshotSSTableReader(validator.request.sessionid);
@@ -736,8 +736,8 @@ public class CompactionManager implements CompactionManagerMBean
         {
             SSTableReader.releaseReferences(sstables);
             iter.close();
-            if (cfs.table.snapshotExists(validator.request.sessionid))
-                cfs.table.clearSnapshot(validator.request.sessionid);
+            if (cfs.snapshotExists(validator.request.sessionid))
+                cfs.clearSnapshot(validator.request.sessionid);
 
             validationExecutor.finishCompaction(ci);
         }


Mime
View raw message