This is an automated email from the ASF dual-hosted git repository. brandonwilliams pushed a commit to branch cassandra-4.1 in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 2f0adfac2b424519c13b119be05583e004157d36 Merge: 9c796dfb27 8b331ddb4d Author: Brandon Williams <[email protected]> AuthorDate: Wed Aug 2 10:44:36 2023 -0500 Merge branch 'cassandra-4.0' into cassandra-4.1 CHANGES.txt | 1 + src/java/org/apache/cassandra/locator/NetworkTopologyStrategy.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --cc CHANGES.txt index 5ce92be10e,a45b6dce5d..6bb86a057a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,6 -1,5 +1,7 @@@ -4.0.12 +4.1.4 + * Skip ColumnFamilyStore#topPartitions initialization when client or tool mode (CASSANDRA-18697) +Merged from 4.0: + * Fix NTS log message when an unrecognized strategy option is passed (CASSANDRA-18679) * Fix BulkLoader ignoring cipher suites options (CASSANDRA-18582) * Migrate Python optparse to argparse (CASSANDRA-17914) Merged from 3.11: diff --cc src/java/org/apache/cassandra/locator/NetworkTopologyStrategy.java index 1d39bbe37f,75aade85af..56bb261781 --- a/src/java/org/apache/cassandra/locator/NetworkTopologyStrategy.java +++ b/src/java/org/apache/cassandra/locator/NetworkTopologyStrategy.java @@@ -315,15 -301,7 +314,16 @@@ public class NetworkTopologyStrategy ex // Validate the data center names super.validateExpectedOptions(); + + if (keyspaceName.equalsIgnoreCase(SchemaConstants.AUTH_KEYSPACE_NAME)) + { + Set<String> differenceSet = Sets.difference((Set<String>) recognizedOptions(), configOptions.keySet()); + if (!differenceSet.isEmpty()) + { + throw new ConfigurationException("Following datacenters have active nodes and must be present in replication options for keyspace " + SchemaConstants.AUTH_KEYSPACE_NAME + ": " + differenceSet.toString()); + } + } + logger.info("Configured datacenter replicas are {}", FBUtilities.toString(datacenters)); } @Override --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
