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 881b08f7015a4342833079e648e478526cc3b31a Merge: 45f4f8c1e8 5e39c54678 Author: Caleb Rackliffe <[email protected]> AuthorDate: Fri Aug 5 15:38:07 2022 -0500 Merge branch 'cassandra-4.1' into trunk CHANGES.txt | 1 + src/java/org/apache/cassandra/db/SystemKeyspace.java | 3 +++ .../org/apache/cassandra/streaming/StreamingChannel.java | 14 ++++++++++++++ .../streaming/async/StreamingMultiplexedChannel.java | 2 +- .../apache/cassandra/tools/BulkLoadConnectionFactory.java | 8 +++++++- test/unit/org/apache/cassandra/tools/ToolRunner.java | 9 +++++---- 6 files changed, 31 insertions(+), 6 deletions(-) diff --cc CHANGES.txt index 3342318ea2,f469fe25b2..626975b190 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,30 -1,5 +1,31 @@@ -4.1-alpha2 +4.2 + * Users of NativeLibrary should handle lack of JNA appropriately when running in client mode (CASSANDRA-17794) + * Warn on unknown directories found in system keyspace directory rather than kill node during startup checks (CASSANDRA-17777) + * Log duplicate rows sharing a partition key found in verify and scrub (CASSANDRA-17789) + * Add separate thread pool for Secondary Index building so it doesn't block compactions (CASSANDRA-17781) + * Added JMX call to getSSTableCountPerTWCSBucket for TWCS (CASSANDRA-17774) + * When doing a host replacement, -Dcassandra.broadcast_interval_ms is used to know when to check the ring but checks that the ring wasn't changed in -Dcassandra.ring_delay_ms, changes to ring delay should not depend on when we publish load stats (CASSANDRA-17776) + * When bootstrap fails, CassandraRoleManager may attempt to do read queries that fail with "Cannot read from a bootstrapping node", and increments unavailables counters (CASSANDRA-17754) + * Add guardrail to disallow DROP KEYSPACE commands (CASSANDRA-17767) + * Remove ephemeral snapshot marker file and introduce a flag to SnapshotManifest (CASSANDRA-16911) + * Add a virtual table that exposes currently running queries (CASSANDRA-15241) + * Allow sstableloader to specify table without relying on path (CASSANDRA-16584) + * Fix TestGossipingPropertyFileSnitch.test_prefer_local_reconnect_on_listen_address (CASSANDRA-17700) + * Add ByteComparable API (CASSANDRA-6936) + * Add guardrail for maximum replication factor (CASSANDRA-17500) + * Increment CQLSH to version 6.2.0 for release 4.2 (CASSANDRA-17646) + * Adding support to perform certificate based internode authentication (CASSANDRA-17661) + * Option to disable CDC writes of repaired data (CASSANDRA-17666) + * When a node is bootstrapping it gets the whole gossip state but applies in random order causing some cases where StorageService will fail causing an instance to not show up in TokenMetadata (CASSANDRA-17676) + * Add CQLSH command SHOW REPLICAS (CASSANDRA-17577) + * Add guardrail to allow disabling of SimpleStrategy (CASSANDRA-17647) + * Change default directory permission to 750 in packaging (CASSANDRA-17470) + * Adding support for TLS client authentication for internode communication (CASSANDRA-17513) + * Add new CQL function maxWritetime (CASSANDRA-17425) + * Add guardrail for ALTER TABLE ADD / DROP / REMOVE column operations (CASSANDRA-17495) + * Rename DisableFlag class to EnableFlag on guardrails (CASSANDRA-17544) +Merged from 4.1: + * Avoid initializing schema via SystemKeyspace.getPreferredIP() with the BulkLoader tool (CASSANDRA-17740) * Uncomment prepared_statements_cache_size, key_cache_size, counter_cache_size, index_summary_capacity which were commented out by mistake in a previous patch Fix breaking change with cache_load_timeout; cache_load_timeout_seconds <=0 and cache_load_timeout=0 are equivalent diff --cc src/java/org/apache/cassandra/tools/BulkLoadConnectionFactory.java index 38a9e31c65,eef0ef4cba..b282932a93 --- a/src/java/org/apache/cassandra/tools/BulkLoadConnectionFactory.java +++ b/src/java/org/apache/cassandra/tools/BulkLoadConnectionFactory.java @@@ -53,7 -53,8 +53,8 @@@ public class BulkLoadConnectionFactory int messagingVersion, StreamingChannel.Kind kind) throws IOException { - // Supply a preferred address to the template, which will be overwritten if encryption is configured. - // The preferred address is always overwritten in create(). This method override only exists so we can avoid ++ // The preferred address is always overwritten in create(). This method override only exists so we can avoid + // falling back to the NettyStreamingConnectionFactory implementation. OutboundConnectionSettings template = new OutboundConnectionSettings(getByAddress(to), getByAddress(preferred)); return create(template, messagingVersion, kind); } diff --cc test/unit/org/apache/cassandra/tools/ToolRunner.java index 6f5516099d,e3b9595e09..d3b9f10c43 --- a/test/unit/org/apache/cassandra/tools/ToolRunner.java +++ b/test/unit/org/apache/cassandra/tools/ToolRunner.java @@@ -402,8 -400,11 +400,11 @@@ public class ToolRunne */ public void assertCleanStdErr() { - assertTrue("Failed because cleaned stdErr wasn't empty: " + getCleanedStderr(), - getCleanedStderr().isEmpty()); + String raw = getStderr(); + String cleaned = getCleanedStderr(); - assertTrue("Failed to clean stderr completely.\nRaw (length=" + raw.length() + "):\n" + raw + ++ assertTrue("Failed to clean stderr completely.\nRaw (length=" + raw.length() + "):\n" + raw + + "\nCleaned (length=" + cleaned.length() + "):\n" + cleaned, + cleaned.trim().isEmpty()); } public void assertOnExitCode() --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
