You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2020/06/23 19:10:16 UTC
[cassandra] branch trunk updated (8368541 -> d69441e)
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git.
from 8368541 Merge branch 'cassandra-3.11' into trunk
new 226b756 Add token to tombstone warning and error messages
new c032136 Merge branch 'cassandra-3.0' into cassandra-3.11
new d69441e Merge branch 'cassandra-3.11' into trunk
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/ReadCommand.java | 4 ++--
.../apache/cassandra/db/filter/TombstoneOverwhelmingException.java | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-3.11' into trunk
Posted by br...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit d69441e0517e98b6e4c84f56c6f9e5ae359456ad
Merge: 8368541 c032136
Author: Brandon Williams <br...@apache.org>
AuthorDate: Tue Jun 23 14:05:13 2020 -0500
Merge branch 'cassandra-3.11' into trunk
CHANGES.txt | 1 +
src/java/org/apache/cassandra/db/ReadCommand.java | 4 ++--
.../apache/cassandra/db/filter/TombstoneOverwhelmingException.java | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --cc CHANGES.txt
index 4fa1567,9b4cf55..bd99365
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,53 -1,9 +1,54 @@@
-3.11.7
+4.0-alpha5
+ * Several mbeans are not unregistered when dropping a keyspace and table (CASSANDRA-14888)
+ * Update defaults for server and client TLS settings (CASSANDRA-15262)
+ * Differentiate follower/initator in StreamMessageHeader (CASSANDRA-15665)
+ * Add a startup check to detect if LZ4 uses java rather than native implementation (CASSANDRA-15884)
+ * Fix missing topology events when running multiple nodes on the same network interface (CASSANDRA-15677)
+ * Create config.yml.MIDRES (CASSANDRA-15712)
+ * Fix handling of fully purged static rows in repaired data tracking (CASSANDRA-15848)
+ * Prevent validation request submission from blocking ANTI_ENTROPY stage (CASSANDRA-15812)
+ * Add fqltool and auditlogviewer to rpm and deb packages (CASSANDRA-14712)
+ * Include DROPPED_COLUMNS in schema digest computation (CASSANDRA-15843)
+ * Fix Cassandra restart from rpm install (CASSANDRA-15830)
+ * Improve handling of 2i initialization failures (CASSANDRA-13606)
+ * Add completion_ratio column to sstable_tasks virtual table (CASANDRA-15759)
+ * Add support for adding custom Verbs (CASSANDRA-15725)
+ * Speed up entire-file-streaming file containment check and allow entire-file-streaming for all compaction strategies (CASSANDRA-15657,CASSANDRA-15783)
+ * Provide ability to configure IAuditLogger (CASSANDRA-15748)
+ * Fix nodetool enablefullquerylog blocking param parsing (CASSANDRA-15819)
+ * Add isTransient to SSTableMetadataView (CASSANDRA-15806)
+ * Fix tools/bin/fqltool for all shells (CASSANDRA-15820)
+ * Fix clearing of legacy size_estimates (CASSANDRA-15776)
+ * Update port when reconnecting to pre-4.0 SSL storage (CASSANDRA-15727)
+ * Only calculate dynamicBadnessThreshold once per loop in DynamicEndpointSnitch (CASSANDRA-15798)
+ * Cleanup redundant nodetool commands added in 4.0 (CASSANDRA-15256)
+ * Update to Python driver 3.23 for cqlsh (CASSANDRA-15793)
+ * Add tunable initial size and growth factor to RangeTombstoneList (CASSANDRA-15763)
+ * Improve debug logging in SSTableReader for index summary (CASSANDRA-15755)
+ * bin/sstableverify should support user provided token ranges (CASSANDRA-15753)
+ * Improve logging when mutation passed to commit log is too large (CASSANDRA-14781)
+ * replace LZ4FastDecompressor with LZ4SafeDecompressor (CASSANDRA-15560)
+ * Fix buffer pool NPE with concurrent release due to in-progress tiny pool eviction (CASSANDRA-15726)
+ * Avoid race condition when completing stream sessions (CASSANDRA-15666)
+ * Flush with fast compressors by default (CASSANDRA-15379)
+ * Fix CqlInputFormat regression from the switch to system.size_estimates (CASSANDRA-15637)
+ * Allow sending Entire SSTables over SSL (CASSANDRA-15740)
+ * Fix CQLSH UTF-8 encoding issue for Python 2/3 compatibility (CASSANDRA-15739)
+ * Fix batch statement preparation when multiple tables and parameters are used (CASSANDRA-15730)
+ * Fix regression with traceOutgoingMessage printing message size (CASSANDRA-15687)
+ * Ensure repaired data tracking reads a consistent amount of data across replicas (CASSANDRA-15601)
+ * Fix CQLSH to avoid arguments being evaluated (CASSANDRA-15660)
+ * Correct Visibility and Improve Safety of Methods in LatencyMetrics (CASSANDRA-15597)
+ * Allow cqlsh to run with Python2.7/Python3.6+ (CASSANDRA-15659,CASSANDRA-15573)
+ * Improve logging around incremental repair (CASSANDRA-15599)
+ * Do not check cdc_raw_directory filesystem space if CDC disabled (CASSANDRA-15688)
+ * Replace array iterators with get by index (CASSANDRA-15394)
+ * Minimize BTree iterator allocations (CASSANDRA-15389)
+Merged from 3.11:
* Upgrade Jackson to 2.9.10 (CASSANDRA-15867)
* Fix CQL formatting of read command restrictions for slow query log (CASSANDRA-15503)
- * Allow sstableloader to use SSL on the native port (CASSANDRA-14904)
Merged from 3.0:
+ * Add token to tombstone warning and error messages (CASSANDRA-15890)
* Fixed range read concurrency factor computation and capped as 10 times tpc cores (CASSANDRA-15752)
* Catch exception on bootstrap resume and init native transport (CASSANDRA-15863)
* Fix replica-side filtering returning stale data with CL > ONE (CASSANDRA-8272, CASSANDRA-8273)
diff --cc src/java/org/apache/cassandra/db/ReadCommand.java
index e8b220f,d4a7737..ffdfc7c
--- a/src/java/org/apache/cassandra/db/ReadCommand.java
+++ b/src/java/org/apache/cassandra/db/ReadCommand.java
@@@ -601,14 -570,9 +601,14 @@@ public abstract class ReadCommand exten
if (warnTombstones)
{
String msg = String.format(
- "Read %d live rows and %d tombstone cells for query %1.512s (see tombstone_warn_threshold)",
- liveRows, tombstones, ReadCommand.this.toCQLString());
+ "Read %d live rows and %d tombstone cells for query %1.512s; token %s (see tombstone_warn_threshold)",
+ liveRows, tombstones, ReadCommand.this.toCQLString(), currentKey.getToken());
ClientWarn.instance.warn(msg);
+ if (tombstones < failureThreshold)
+ {
+ metric.tombstoneWarnings.inc();
+ }
+
logger.warn(msg);
}
diff --cc src/java/org/apache/cassandra/db/filter/TombstoneOverwhelmingException.java
index 982ee1f,622edb4..f7371ec
--- a/src/java/org/apache/cassandra/db/filter/TombstoneOverwhelmingException.java
+++ b/src/java/org/apache/cassandra/db/filter/TombstoneOverwhelmingException.java
@@@ -26,13 -26,13 +26,13 @@@ import org.apache.cassandra.db.marshal.
public class TombstoneOverwhelmingException extends RuntimeException
{
- public TombstoneOverwhelmingException(int numTombstones, String query, CFMetaData metadata, DecoratedKey lastPartitionKey, ClusteringPrefix lastClustering)
+ public TombstoneOverwhelmingException(int numTombstones, String query, TableMetadata metadata, DecoratedKey lastPartitionKey, ClusteringPrefix lastClustering)
{
- super(String.format("Scanned over %d tombstones during query '%s' (last scanned row partion key was (%s)); query aborted",
- numTombstones, query, makePKString(metadata, lastPartitionKey.getKey(), lastClustering)));
+ super(String.format("Scanned over %d tombstones during query '%s' (last scanned row token was %s and partion key was (%s)); query aborted",
+ numTombstones, query, lastPartitionKey.getToken(), makePKString(metadata, lastPartitionKey.getKey(), lastClustering)));
}
- private static String makePKString(CFMetaData metadata, ByteBuffer partitionKey, ClusteringPrefix clustering)
+ private static String makePKString(TableMetadata metadata, ByteBuffer partitionKey, ClusteringPrefix clustering)
{
StringBuilder sb = new StringBuilder();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org