Updated Branches: refs/heads/cassandra-2.0 02d5ef3e7 -> 546cbf5ff refs/heads/trunk 8bdba79f9 -> 7dd9ea2e8
avoid logging tombstone warnings during compaction Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/546cbf5f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/546cbf5f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/546cbf5f Branch: refs/heads/cassandra-2.0 Commit: 546cbf5ffc8205e361ed9cf57b44faa384097c45 Parents: 02d5ef3 Author: Jonathan Ellis <[email protected]> Authored: Wed Oct 2 11:00:04 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Wed Oct 2 11:00:04 2013 -0500 ---------------------------------------------------------------------- .../cassandra/db/columniterator/IdentityQueryFilter.java | 2 +- src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/546cbf5f/src/java/org/apache/cassandra/db/columniterator/IdentityQueryFilter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/columniterator/IdentityQueryFilter.java b/src/java/org/apache/cassandra/db/columniterator/IdentityQueryFilter.java index 7b1085a..828f7e5 100644 --- a/src/java/org/apache/cassandra/db/columniterator/IdentityQueryFilter.java +++ b/src/java/org/apache/cassandra/db/columniterator/IdentityQueryFilter.java @@ -31,7 +31,7 @@ public class IdentityQueryFilter extends SliceQueryFilter } @Override - protected boolean respectTombstoneFailures() + protected boolean respectTombstoneThresholds() { return false; } http://git-wip-us.apache.org/repos/asf/cassandra/blob/546cbf5f/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java b/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java index 9c67d71..794d31c 100644 --- a/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java +++ b/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java @@ -194,7 +194,7 @@ public class SliceQueryFilter implements IDiskAtomFilter if (columnCounter.live() > count) break; - if (respectTombstoneFailures() && columnCounter.ignored() > DatabaseDescriptor.getTombstoneFailureThreshold()) + 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()); @@ -205,11 +205,11 @@ public class SliceQueryFilter implements IDiskAtomFilter } Tracing.trace("Read {} live and {} tombstoned cells", columnCounter.live(), columnCounter.ignored()); - if (columnCounter.ignored() > DatabaseDescriptor.getTombstoneWarnThreshold()) + if (respectTombstoneThresholds() && columnCounter.ignored() > DatabaseDescriptor.getTombstoneWarnThreshold()) logger.warn("Read {} live and {} tombstoned cells (see tombstone_warn_threshold)", columnCounter.live(), columnCounter.ignored()); } - protected boolean respectTombstoneFailures() + protected boolean respectTombstoneThresholds() { return true; }
