This is an automated email from the ASF dual-hosted git repository. samt pushed a commit to branch cep-21-tcm in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit a3564a3fafa00ed2079275ea1576607e0b5c44c7 Author: Marcus Eriksson <[email protected]> AuthorDate: Mon Mar 13 13:25:54 2023 +0100 [CEP-21] Correctly represent bootstrapping nodes in StorageService patch by Marcus Eriksson; reviewed by Alex Petrov and Sam Tunnicliffe for CASSANDRA-18409 --- src/java/org/apache/cassandra/service/StorageService.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java index 8beb9c1e94..5f16329d66 100644 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@ -1621,8 +1621,8 @@ public class StorageService extends NotificationBroadcasterSupport implements IE public boolean isBootstrapMode() { - // todo: old variable was never assigned - return false; + ClusterMetadata metadata = ClusterMetadata.currentNullable(); + return metadata != null && metadata.myNodeState() == BOOTSTRAPPING; } public Map<List<String>, List<String>> getRangeToEndpointMap(String keyspace) @@ -2367,12 +2367,12 @@ public class StorageService extends NotificationBroadcasterSupport implements IE @Deprecated public List<String> getJoiningNodes() { - return stringify(endpointsWithState(BOOTSTRAPPING, REGISTERED), false); + return stringify(endpointsWithState(BOOTSTRAPPING), false); } public List<String> getJoiningNodesWithPort() { - return stringify(endpointsWithState(BOOTSTRAPPING, REGISTERED), true); + return stringify(endpointsWithState(BOOTSTRAPPING), true); } @Deprecated --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
