natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

backport CASSANDRA-6011

This commit is contained in:
Yuki Morishita 2013-09-13 11:24:58 -05:00
parent eb884a582b
commit cec564d22f
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -1,6 +1,7 @@
1.1.next 1.1.next
* Backport compaction exception handling from 1.2 * Backport compaction exception handling from 1.2
* Correctly validate sparse composite cells in scrub (CASSANDRA-5855) * Correctly validate sparse composite cells in scrub (CASSANDRA-5855)
* Fix snapshots in use get deleted during snapshot repair (CASSANDRA-6011)
1.1.12 1.1.12

6
src/java/org/apache/cassandra/db/compaction/CompactionManager.java
View File

@ -688,7 +688,7 @@ public class CompactionManager implements CompactionManagerMBean
return; return;
Collection<SSTableReader> sstables; 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. // If there is a snapshot created for the session then read from there.
sstables = cfs.getSnapshotSSTableReader(validator.request.sessionid); sstables = cfs.getSnapshotSSTableReader(validator.request.sessionid);
@ -736,8 +736,8 @@ public class CompactionManager implements CompactionManagerMBean
{ {
SSTableReader.releaseReferences(sstables); SSTableReader.releaseReferences(sstables);
iter.close(); iter.close();
if (cfs.table.snapshotExists(validator.request.sessionid)) if (cfs.snapshotExists(validator.request.sessionid))
cfs.table.clearSnapshot(validator.request.sessionid); cfs.clearSnapshot(validator.request.sessionid);
validationExecutor.finishCompaction(ci); validationExecutor.finishCompaction(ci);
} }