This is an automated email from the ASF dual-hosted git repository.

ifesdjeen pushed a commit to branch cep-15-accord
in repository https://gitbox.apache.org/repos/asf/cassandra.git


The following commit(s) were added to refs/heads/cep-15-accord by this push:
     new 80a725a6ad Fix restartWithEpochChanges test; make CMS nodes first 
gossip with CMS nodes
80a725a6ad is described below

commit 80a725a6ad399d8aefd9244d0fc96056c4c48b7f
Author: Alex Petrov <[email protected]>
AuthorDate: Fri Nov 29 16:39:08 2024 +0100

    Fix restartWithEpochChanges test; make CMS nodes first gossip with CMS nodes
    
    Patch by Alex Petrov; reviewed by Sam Tunnicliffe for CASSANDRA-20123
---
 src/java/org/apache/cassandra/service/StorageService.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/java/org/apache/cassandra/service/StorageService.java 
b/src/java/org/apache/cassandra/service/StorageService.java
index b23f5318a0..9d7c03d51c 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -809,8 +809,8 @@ public class StorageService extends 
NotificationBroadcasterSupport implements IE
         
Gossiper.instance.addLocalApplicationState(ApplicationState.SSTABLE_VERSIONS,
                                                    
valueFactory.sstableVersions(sstablesTracker.versionsInUse()));
 
-        if (ClusterMetadataService.state() == 
ClusterMetadataService.State.REMOTE)
-            Gossiper.instance.triggerRoundWithCMS();
+        Gossiper.instance.triggerRoundWithCMS();
+
         // Has to be called after the host id has potentially changed
         try
         {


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to