This is an automated email from the ASF dual-hosted git repository. adelapena pushed a commit to branch cassandra-3.11 in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 01add65597bc76927674e33db3f48552c06eb82c Merge: 760c7e8 69b653a Author: Andrés de la Peña <[email protected]> AuthorDate: Thu Jul 29 12:03:03 2021 +0100 Merge branch 'cassandra-3.0' into cassandra-3.11 CHANGES.txt | 5 +++++ src/java/org/apache/cassandra/service/StorageProxy.java | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --cc CHANGES.txt index e007bc8,81d707a..c3a8ada --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,8 +1,22 @@@ -3.0.26: ++3.11.12 ++Merged from 3.0: + * Remove mutation data from error log message (CASSANDRA-16817) + + -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: * Binary releases no longer bundle the apidocs (javadoc) (CASSANDRA-16557) * Migrate dependency handling from maven-ant-tasks to resolver-ant-tasks, removing lib/ directory from version control (CASSANDRA-16557) * Don't allow seeds to replace without using unsafe (CASSANDRA-14463) diff --cc src/java/org/apache/cassandra/service/StorageProxy.java index d6f713e,d165730..9c74040 --- a/src/java/org/apache/cassandra/service/StorageProxy.java +++ b/src/java/org/apache/cassandra/service/StorageProxy.java @@@ -915,10 -877,10 +915,11 @@@ public class StorageProxy implements St } catch (Exception exc) { - logger.error("Error applying local view update to keyspace {}: {}", mutation.getKeyspaceName(), mutation); + logger.error("Error applying local view update: Mutation (keyspace {}, tables {}, partition key {})", + mutation.getKeyspaceName(), mutation.getColumnFamilyIds(), mutation.key()); throw exc; } + } else { wrappers.add(wrapViewBatchResponseHandler(mutation, --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
