From eefc5a688ec1048b251c41fa4ecc72d0cb8d6312 Mon Sep 17 00:00:00 2001
From: Asias He <asias@cloudius-systems.com>
Date: Tue, 26 May 2015 16:21:32 +0800
Subject: [PATCH] storage_service: Call join_token_ring

After prepare_to_join, call join_token_ring to join the ring. We do
nothing ATM.
---
 service/storage_service.hh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/service/storage_service.hh b/service/storage_service.hh
index 835c5d5e4b..a632106924 100644
--- a/service/storage_service.hh
+++ b/service/storage_service.hh
@@ -522,6 +522,7 @@ public:
         Runtime.getRuntime().addShutdownHook(drainOnShutdown);
 #endif
         prepare_to_join();
+        join_token_ring(delay);
 #if 0
         // Has to be called after the host id has potentially changed in prepareToJoin().
         for (ColumnFamilyStore cfs : ColumnFamilyStore.all())
@@ -624,11 +625,9 @@ private:
             BatchlogManager.instance.start();
 #endif
         }
-
     }
+    void join_token_ring(int delay) {
 #if 0
-    private void joinTokenRing(int delay) throws ConfigurationException
-    {
         joined = true;
 
         // We bootstrap if we haven't successfully bootstrapped before, as long as we are not a seed.
@@ -802,8 +801,9 @@ private:
         {
             logger.info("Startup complete, but write survey mode is active, not becoming an active ring member. Use JMX (StorageService->joinRing()) to finalize ring joining.");
         }
+#endif
     }
-
+#if 0
     public void gossipSnitchInfo()
     {
         IEndpointSnitch snitch = DatabaseDescriptor.getEndpointSnitch();