This is an automated email from the ASF dual-hosted git repository. maedhroz pushed a commit to branch cep-15-accord in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit ac8d9b343a05c31b94e540b9954ccdf021b97aac Author: Benedict Elliott Smith <[email protected]> AuthorDate: Thu Jan 19 20:50:11 2023 +0000 ninja fix CASSANDRA-18142: System.distributedKeyspaces is unsorted --- .../org/apache/cassandra/service/accord/AccordTopologyUtils.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/java/org/apache/cassandra/service/accord/AccordTopologyUtils.java b/src/java/org/apache/cassandra/service/accord/AccordTopologyUtils.java index bc6ec7e7b6..2c56f56b14 100644 --- a/src/java/org/apache/cassandra/service/accord/AccordTopologyUtils.java +++ b/src/java/org/apache/cassandra/service/accord/AccordTopologyUtils.java @@ -97,11 +97,12 @@ public class AccordTopologyUtils public static Topology createTopology(long epoch) { TokenMetadata tokenMetadata = StorageService.instance.getTokenMetadata(); + List<String> keyspaces = new ArrayList<>(Schema.instance.distributedKeyspaces().names()); + keyspaces.sort(String::compareTo); + List<Shard> shards = new ArrayList<>(); - for (String keyspace : Schema.instance.distributedKeyspaces().names()) - { + for (String keyspace : keyspaces) shards.addAll(createShards(keyspace, tokenMetadata)); - } return new Topology(epoch, shards.toArray(new Shard[0])); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
