From 49427cd8696eb1578cb234972f4aea4811d827c2 Mon Sep 17 00:00:00 2001 From: Jonathan Ellis Date: Thu, 16 Jan 2014 16:40:06 -0600 Subject: [PATCH] Add ks.cf names to tombstone logging patch by Kevin Lovato; reviewed by jbellis for CASSANDRA-6597 --- CHANGES.txt | 1 + .../org/apache/cassandra/db/filter/SliceQueryFilter.java | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index d994612404..76c020a0d3 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 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) diff --git a/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java b/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java index 794d31ca2d..b43308fa5b 100644 --- a/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java +++ b/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java @@ -197,7 +197,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(); } @@ -206,7 +207,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()