This is an automated email from the ASF dual-hosted git repository.

bdeggleston pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git

commit 45df7627d53fc5ac65669e2c24a5384332700ac5
Merge: 5aadbc62f0 eaa20275ff
Author: Blake Eggleston <bl...@ultrablake.com>
AuthorDate: Thu Apr 3 15:30:15 2025 -0700

    Merge branch 'cassandra-5.0' into trunk
    
    * cassandra-5.0:
      Fix mixed mode paxos hang

 CHANGES.txt                                        |  1 +
 .../org/apache/cassandra/service/StorageProxy.java |  2 +-
 .../service/paxos/v1/PrepareCallback.java          | 29 ++++++-
 .../distributed/upgrade/MixedModePaxosTTLTest.java | 94 ++++++++++++++++++++++
 .../upgrade/MixedModePaxosTestBase.java            | 55 ++++++++++---
 5 files changed, 170 insertions(+), 11 deletions(-)

diff --cc CHANGES.txt
index 04a146aa02,6e53c8ac93..029a87ae29
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -183,32 -17,8 +183,33 @@@ Merged from 5.0
   * Skip check for DirectIO when initializing tools (CASSANDRA-20289)
   * Avoid under-skipping during intersections when an iterator has mixed 
STATIC and WIDE keys (CASSANDRA-20258)
   * Correct the default behavior of compareTo() when comparing WIDE and STATIC 
PrimaryKeys (CASSANDRA-20238)
 + * Make sure we can set parameters when configuring CassandraCIDRAuthorizer 
(CASSANDRA-20220)
 + * Add selected SAI index state and query performance metrics to nodetool 
tablestats (CASSANDRA-20026)
 + * Remove v30 and v3X from 5.x in-JVM upgrade tests (CASSANDRA-20103)
 + * Avoid memory allocation in offheap_object's NativeCell.valueSize() and 
NativeClustering.dataSize() (CASSANDRA-20162)
 + * Add flag to avoid invalidating key cache on sstable deletions 
(CASSANDRA-20068)
 + * Interpret inet, bigint, varint, and decimal as non-reversed types for 
query construction and post-filtering (CASSANDRA-20100)
 + * Streamline the serialized format for index status gossip messages 
(CASSANDRA-20058)
 + * Batch clusterings into single SAI partition post-filtering reads 
(CASSANDRA-19497)
 + * Ban the usage of "var" instead of full types in the production code 
(CASSANDRA-20038)
 + * Suppress CVE-2024-45772, upgrade to lucene-core-9.12.0.jar 
(CASSANDRA-20024)
 + * Use SinglePartitionReadCommand for index queries that use strict filtering 
(CASSANDRA-19968)
 + * Always write local expiration time as an int to LivenessInfo digest 
(CASSANDRA-19989)
 + * Enables IAuthenticator's to return own AuthenticateMessage 
(CASSANDRA-19984)
 + * Use ParameterizedClass for all auth-related implementations 
(CASSANDRA-19946)
 + * Correct out-of-date metrics and configuration documentation for SAI 
(CASSANDRA-19898)
 + * Make configuration entries in memtable section order-independent 
(CASSANDRA-19906)
 + * Add guardrail for enabling usage of VectorType (CASSANDRA-19903)
 + * Set executable flag for shell scripts in .build directory for source 
artifact (CASSANDRA-19896)
 + * Throw ConfigurationException when commitlog_disk_access_mode is direct but 
direct IO is not supported by filesystem (CASSANDRA-19812)
 + * Memtable allocation type unslabbed_heap_buffers_logged will cause an 
assertion error for TrieMemtables and SegmentedTrieMemtables (CASSANDRA-19835)
 + * Minor improvements in Cassandra shutdown and startup logs (CASSANDRA-19818)
 + * Fix direct IO support always being evaluated to false upon the first start 
of a node (CASSANDRA-19779)
 + * Deprecate and ignore use_deterministic_table_id (CASSANDRA-19809)
 + * Prioritize built indexes in IndexStatusManager (CASSANDRA-19400)
 + * Add java.base/java.lang.reflect among opens for jvm11-client.options 
(CASSANDRA-19780)
  Merged from 4.1:
+  * Fix mixed mode paxos ttl commit hang (CASSANDRA-20514)
   * Fix paxos mixed mode infinite loop (CASSANDRA-20493)
   * Optionally skip exception logging on invalid legacy protocol magic 
exception (CASSANDRA-19483)
   * Fix SimpleClient ability to release acquired capacity (CASSANDRA-20202)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org

Reply via email to