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

Merge branch 'cassandra-2.0' into trunk

This commit is contained in:
Jonathan Ellis 2014-01-16 16:40:13 -06:00
parent 6947e19ca6 49427cd869
commit 3d5eea5b87
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

@ -26,6 +26,7 @@
2.0.5
* Add ks.cf names to tombstone logging (CASSANDRA-6597)
* Use LOCAL_QUORUM for LWT operations at LOCAL_SERIAL (CASSANDRA-6495)
* Wait for gossip to settle before accepting client connections (CASSANDRA-4288)
* Delete unfinished compaction incrementally (CASSANDRA-6086)

6
src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java
View File

@ -207,7 +207,8 @@ public class SliceQueryFilter implements IDiskAtomFilter
if (respectTombstoneThresholds() && columnCounter.ignored() > DatabaseDescriptor.getTombstoneFailureThreshold())
{
Tracing.trace("Scanned over {} tombstones; query aborted (see tombstone_fail_threshold)", DatabaseDescriptor.getTombstoneFailureThreshold());
logger.error("Scanned over {} tombstones; query aborted (see tombstone_fail_threshold)", DatabaseDescriptor.getTombstoneFailureThreshold());
logger.error("Scanned over {} tombstones in {}.{}; query aborted (see tombstone_fail_threshold)",
DatabaseDescriptor.getTombstoneFailureThreshold(), container.metadata().ksName, container.metadata().cfName);
throw new TombstoneOverwhelmingException();
}
@ -216,7 +217,8 @@ public class SliceQueryFilter implements IDiskAtomFilter
Tracing.trace("Read {} live and {} tombstoned cells", columnCounter.live(), columnCounter.ignored());
if (respectTombstoneThresholds() && columnCounter.ignored() > DatabaseDescriptor.getTombstoneWarnThreshold())
logger.warn("Read {} live and {} tombstoned cells (see tombstone_warn_threshold)", columnCounter.live(), columnCounter.ignored());
logger.warn("Read {} live and {} tombstoned cells in {}.{} (see tombstone_warn_threshold)",
columnCounter.live(), columnCounter.ignored(), container.metadata().ksName, container.metadata().cfName);
}
protected boolean respectTombstoneThresholds()