You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by bl...@apache.org on 2016/02/22 12:11:39 UTC
cassandra git commit: Add partition key to
TombstoneOverwhelmingException error message
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 757e314ce -> 14a2157bc
Add partition key to TombstoneOverwhelmingException error message
patch by Brett Snyder; reviewed by Benjamin Lerer for CASSANDRA-10888
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/14a2157b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/14a2157b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/14a2157b
Branch: refs/heads/cassandra-2.1
Commit: 14a2157bc7e56b46785bc1a572155e584c972f4a
Parents: 757e314
Author: Brett Snyder <bs...@gmail.com>
Authored: Mon Feb 22 11:43:37 2016 +0100
Committer: Benjamin Lerer <b....@gmail.com>
Committed: Mon Feb 22 11:43:37 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/db/filter/SliceQueryFilter.java | 11 ++++++-----
2 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/14a2157b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index c40c3ce..ef8c5a7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.14
+ * Add partition key to TombstoneOverwhelmingException error message (CASSANDRA-10888)
* Use logback setting for 'cassandra -v' command (CASSANDRA-10767)
* Fix sstableloader to unthrottle streaming by default (CASSANDRA-9714)
* Fix incorrect warning in 'nodetool status' (CASSANDRA-10176)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/14a2157b/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 973477f..957d1ba 100644
--- a/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java
+++ b/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java
@@ -38,7 +38,6 @@ import org.apache.cassandra.io.sstable.SSTableReader;
import org.apache.cassandra.io.util.DataOutputPlus;
import org.apache.cassandra.io.util.FileDataInput;
import org.apache.cassandra.tracing.Tracing;
-import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.Pair;
public class SliceQueryFilter implements IDiskAtomFilter
@@ -281,10 +280,12 @@ public class SliceQueryFilter implements IDiskAtomFilter
{
Tracing.trace("Scanned over {} tombstones; query aborted (see tombstone_failure_threshold)",
DatabaseDescriptor.getTombstoneFailureThreshold());
- logger.error("Scanned over {} tombstones in {}.{}; query aborted (see tombstone_failure_threshold)",
- DatabaseDescriptor.getTombstoneFailureThreshold(),
- container.metadata().ksName,
- container.metadata().cfName);
+ String msg = String.format("Scanned over %d tombstones in %s.%s for key: %1.512s; query aborted (see tombstone_failure_threshold).",
+ DatabaseDescriptor.getTombstoneFailureThreshold(),
+ container.metadata().ksName,
+ container.metadata().cfName,
+ container.metadata().getKeyValidator().getString(key.getKey()));
+ logger.error(msg);
throw new TombstoneOverwhelmingException();
}