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

Don't do defragmentation if doing reads from repaired sstables. 

Patch by marcuse; reviewed by Sylvain Lebresne for CASSANDRA-10342
This commit is contained in:
Marcus Eriksson 2015-09-16 07:52:19 +02:00
parent 561000aa30
commit 0c53c3a9e5
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -1,4 +1,5 @@
2.1.14 2.1.14
* Don't do defragmentation if reading from repaired sstables (CASSANDRA-10342)
* Fix streaming_socket_timeout_in_ms not enforced (CASSANDRA-11286) * Fix streaming_socket_timeout_in_ms not enforced (CASSANDRA-11286)
* Avoid dropping message too quickly due to missing unit conversion (CASSANDRA-11302) * Avoid dropping message too quickly due to missing unit conversion (CASSANDRA-11302)
* COPY FROM on large datasets: fix progress report and debug performance (CASSANDRA-11053) * COPY FROM on large datasets: fix progress report and debug performance (CASSANDRA-11053)

6
src/java/org/apache/cassandra/db/CollationController.java
View File

@ -108,7 +108,7 @@ public class CollationController
/* add the SSTables on disk */ /* add the SSTables on disk */
Collections.sort(view.sstables, SSTableReader.maxTimestampComparator); Collections.sort(view.sstables, SSTableReader.maxTimestampComparator);
boolean onlyUnrepaired = true;
// read sorted sstables // read sorted sstables
for (SSTableReader sstable : view.sstables) for (SSTableReader sstable : view.sstables)
{ {
@ -122,7 +122,8 @@ public class CollationController
reduceNameFilter(reducedFilter, container, currentMaxTs); reduceNameFilter(reducedFilter, container, currentMaxTs);
if (((NamesQueryFilter) reducedFilter.filter).columns.isEmpty()) if (((NamesQueryFilter) reducedFilter.filter).columns.isEmpty())
break; break;
if (sstable.isRepaired())
onlyUnrepaired = false;
Tracing.trace("Merging data from sstable {}", sstable.descriptor.generation); Tracing.trace("Merging data from sstable {}", sstable.descriptor.generation);
sstable.incrementReadCount(); sstable.incrementReadCount();
OnDiskAtomIterator iter = reducedFilter.getSSTableColumnIterator(sstable); OnDiskAtomIterator iter = reducedFilter.getSSTableColumnIterator(sstable);
@ -149,6 +150,7 @@ public class CollationController
// "hoist up" the requested data into a more recent sstable // "hoist up" the requested data into a more recent sstable
if (sstablesIterated > cfs.getMinimumCompactionThreshold() if (sstablesIterated > cfs.getMinimumCompactionThreshold()
&& onlyUnrepaired
&& !cfs.isAutoCompactionDisabled() && !cfs.isAutoCompactionDisabled()
&& cfs.getCompactionStrategy().shouldDefragment()) && cfs.getCompactionStrategy().shouldDefragment())
{ {