This is an automated email from the ASF dual-hosted git repository. jonmeredith pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 3b0b52d0f9cc51a694252d95a88457ba3a876583 Merge: b7eafa94f3 6559983d6c Author: Jon Meredith <[email protected]> AuthorDate: Thu Apr 25 14:01:46 2024 -0600 Merge branch 'cassandra-5.0' into trunk CHANGES.txt | 1 + .../org/apache/cassandra/db/lifecycle/LogFile.java | 36 ++-- .../cassandra/db/lifecycle/LogReplicaSet.java | 6 +- .../TransactionAlreadyCompletedException.java | 36 ++++ .../apache/cassandra/streaming/StreamSession.java | 20 ++ .../streaming/StreamFailedWhileReceivingTest.java | 208 +++++++++++++++++++++ .../cassandra/db/lifecycle/LogTransactionTest.java | 40 +++- 7 files changed, 332 insertions(+), 15 deletions(-) diff --cc CHANGES.txt index cf55f7b91c,ee0696f40a..ed314c60d3 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -72,9 -36,10 +72,10 @@@ Merged from 4.1 * Fix hints delivery for a node going down repeatedly (CASSANDRA-19495) * Do not go to disk for reading hints file sizes (CASSANDRA-19477) * Fix system_views.settings to handle array types (CASSANDRA-19475) - * Memoize Cassandra verion and add a backoff interval for failed schema pulls (CASSANDRA-18902) * Fix StackOverflowError on ALTER after many previous schema changes (CASSANDRA-19166) + * Memoize Cassandra verion (CASSANDRA-18902) Merged from 4.0: + * Streaming exception race creates corrupt transaction log files that prevent restart (CASSANDRA-18736) * Fix CQL tojson timestamp output on negative timestamp values before Gregorian calendar reform in 1582 (CASSANDRA-19566) * Fix few types issues and implement types compatibility tests (CASSANDRA-19479) * Change logging to TRACE when failing to get peer certificate (CASSANDRA-19508) diff --cc src/java/org/apache/cassandra/streaming/StreamSession.java index f89a2569ec,a942b9ee9a..217c70f058 --- a/src/java/org/apache/cassandra/streaming/StreamSession.java +++ b/src/java/org/apache/cassandra/streaming/StreamSession.java @@@ -59,7 -57,7 +59,8 @@@ import org.apache.cassandra.db.Director import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.db.compaction.CompactionStrategyManager; + import org.apache.cassandra.db.lifecycle.TransactionAlreadyCompletedException; +import org.apache.cassandra.dht.OwnedRanges; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; import org.apache.cassandra.io.util.File; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
