This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 00af9a6d3a619037b822d14a03b3a85fcfd7ca12 Merge: 9b99eac 3d59557 Author: Brandon Williams <[email protected]> AuthorDate: Wed Jul 14 10:00:37 2021 -0500 Merge branch 'cassandra-3.0' into cassandra-3.11 CHANGES.txt | 1 + src/java/org/apache/cassandra/service/ReadCallback.java | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --cc CHANGES.txt index 526d8a2,0c263e8..3548a03 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,6 +1,18 @@@ -3.0.25: +3.11.11 + * Make cqlsh use the same set of reserved keywords than the server uses (CASSANDRA-15663) + * Optimize bytes skipping when reading SSTable files (CASSANDRA-14415) + * Enable tombstone compactions when unchecked_tombstone_compaction is set in TWCS (CASSANDRA-14496) + * Read only the required SSTables for single partition queries (CASSANDRA-16737) + * Fix LeveledCompactionStrategy compacts last level throw an ArrayIndexOutOfBoundsException (CASSANDRA-15669) + * Maps $CASSANDRA_LOG_DIR to cassandra.logdir java property when executing nodetool (CASSANDRA-16199) + * Nodetool garbagecollect should retain SSTableLevel for LCS (CASSANDRA-16634) + * Ignore stale acks received in the shadow round (CASSANDRA-16588) + * Add autocomplete and error messages for provide_overlapping_tombstones (CASSANDRA-16350) + * Add StorageServiceMBean.getKeyspaceReplicationInfo(keyspaceName) (CASSANDRA-16447) + * Make sure sstables with moved starts are removed correctly in LeveledGenerations (CASSANDRA-16552) + * Upgrade jackson-databind to 2.9.10.8 (CASSANDRA-16462) +Merged from 3.0: + * Push digest mismatch exceptions to trace (CASSANDRA-14900) - * Support long names in nodetool output (CASSANDRA-14162) * Handle correctly the exceptions thrown by custom QueryHandler constructors (CASSANDRA-16703) * Adding columns via ALTER TABLE can generate corrupt sstables (CASSANDRA-16735) * Add flag to disable ALTER...DROP COMPACT STORAGE statements (CASSANDRA-16733) diff --cc src/java/org/apache/cassandra/service/ReadCallback.java index b312852,837ab5e..46023df --- a/src/java/org/apache/cassandra/service/ReadCallback.java +++ b/src/java/org/apache/cassandra/service/ReadCallback.java @@@ -240,12 -235,10 +240,10 @@@ public class ReadCallback implements IA if (traceState != null) traceState.trace("Digest mismatch: {}", e.toString()); - if (logger.isDebugEnabled()) - logger.debug("Digest mismatch:", e); ReadRepairMetrics.repairedBackground.mark(); - - final DataResolver repairResolver = new DataResolver(keyspace, command, consistencyLevel, endpoints.size()); + + final DataResolver repairResolver = new DataResolver(keyspace, command, consistencyLevel, endpoints.size(), queryStartNanoTime); AsyncRepairCallback repairHandler = new AsyncRepairCallback(repairResolver, endpoints.size()); for (InetAddress endpoint : endpoints) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
