[jira] [Created] (CASSANDRA-12935) Use saved tokens when setting local tokens on StorageService.joinRing()

["Paulo Motta (JIRA)" <ji...@apache.org>]

Paulo Motta created CASSANDRA-12935:
---------------------------------------

             Summary: Use saved tokens when setting local tokens on StorageService.joinRing()
                 Key: CASSANDRA-12935
                 URL: https://issues.apache.org/jira/browse/CASSANDRA-12935
             Project: Cassandra
          Issue Type: Bug
          Components: Coordination
            Reporter: Paulo Motta
            Assignee: Paulo Motta
            Priority: Minor


The introduction of {{StorageService.finishJoiningRing()}} on CASSANDRA-8523:
{code:java}
@@ -885,17 +896,14 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
         {
             if (dataAvailable)
             {
-                // start participating in the ring.
-                SystemKeyspace.setBootstrapState(SystemKeyspace.BootstrapState.COMPLETED);
-                setTokens(bootstrapTokens);
+                finishJoiningRing();
+
                 // remove the existing info about the replaced node.
                 if (!current.isEmpty())
                 {
                     for (InetAddress existing : current)
                         Gossiper.instance.replacedEndpoint(existing);
                 }
-                assert tokenMetadata.sortedTokens().size() > 0;
-                doAuthSetup();
             }
             else
             {
@@ -908,6 +916,11 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
         else if (isSurveyMode)
         {
-            setTokens(SystemKeyspace.getSavedTokens());
-            SystemKeyspace.setBootstrapState(SystemKeyspace.BootstrapState.COMPLETED);
             isSurveyMode = false;
             logger.info("Leaving write survey mode and joining ring at operator request");
-            assert tokenMetadata.sortedTokens().size() > 0;
-
-            doAuthSetup();
+            finishJoiningRing();
         }
     }
 
+    private void finishJoiningRing()
+    {
+        // start participating in the ring.
+        SystemKeyspace.setBootstrapState(SystemKeyspace.BootstrapState.COMPLETED);
+        setTokens(bootstrapTokens);
+
+        assert tokenMetadata.sortedTokens().size() > 0;
+        doAuthSetup();
+    }
+
{code}

slightly changed the way tokens are set on {{StorageService.joinRing()}} when {{cassandra.write_survey=true}} from {{setTokens(SystemKeyspace.getSavedTokens())}}
to {{setTokens(bootstrapTokens)}}.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)