This is an automated email from the ASF dual-hosted git repository. maedhroz pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 063a37699c3d5b8548b9b7d926daeab3e08eb7db Merge: 740cec41d2 663e51d928 Author: Caleb Rackliffe <calebrackli...@gmail.com> AuthorDate: Thu Jun 2 12:15:17 2022 -0500 Merge branch 'cassandra-4.1' into trunk CHANGES.txt | 1 + .../org/apache/cassandra/repair/LocalSyncTask.java | 46 ++++----- .../apache/cassandra/streaming/StreamSession.java | 6 ++ .../cassandra/streaming/StreamingChannel.java | 9 ++ .../async/NettyStreamingConnectionFactory.java | 9 ++ .../async/StreamingMultiplexedChannel.java | 60 ++++++----- .../cassandra/tools/BulkLoadConnectionFactory.java | 21 +++- .../distributed/test/RepairErrorsTest.java | 114 +++++++++++++++++++-- 8 files changed, 208 insertions(+), 58 deletions(-) diff --cc CHANGES.txt index 30dfdf763c,cfb7bcb41a..ced41dea6c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -15,12 -14,6 +15,13 @@@ Merged from 4.1 * Fix repair_request_timeout_in_ms and remove paxos_auto_repair_threshold_mb (CASSANDRA-17557) * Incremental repair leaks SomeRepairFailedException after switch away from flatMap (CASSANDRA-17620) * StorageService read threshold get methods throw NullPointerException due to not handling null configs (CASSANDRA-17593) +Merged from 4.0: ++ * Ensure FileStreamTask cannot compromise shared channel proxy for system table when interrupted (CASSANDRA-17663) +Merged from 3.11: +Merged from 3.0: + + +4.1 * Rename truncate_drop guardrail to drop_truncate_table (CASSANDRA-17592) * nodetool enablefullquerylog can NPE when directory has no files (CASSANDRA-17595) * Add auto_snapshot_ttl configuration (CASSANDRA-16790) diff --cc src/java/org/apache/cassandra/streaming/StreamSession.java index 595890def8,2036262e54..d1df7d273e --- a/src/java/org/apache/cassandra/streaming/StreamSession.java +++ b/src/java/org/apache/cassandra/streaming/StreamSession.java @@@ -1116,6 -1116,12 +1116,12 @@@ public class StreamSession implements I public synchronized void abort() { + if (state.isFinalState()) + { + logger.debug("[Stream #{}] Stream session with peer {} is already in a final state on abort.", planId(), peer); + return; + } - ++ logger.info("[Stream #{}] Aborting stream session with peer {}...", planId(), peer); if (channel.connected()) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org