cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject git commit: Fix bad merge of CASSANDRA-6961 from 2.0 to 2.1
Date Tue, 08 Apr 2014 23:18:45 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.1 1050120c6 -> 76db70e9d


Fix bad merge of CASSANDRA-6961 from 2.0 to 2.1


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/76db70e9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/76db70e9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/76db70e9

Branch: refs/heads/cassandra-2.1
Commit: 76db70e9d46688a6ef57f963dae0dad3d7c04ca7
Parents: 1050120
Author: Tyler Hobbs <tyler@datastax.com>
Authored: Tue Apr 8 18:13:51 2014 -0500
Committer: Tyler Hobbs <tyler@datastax.com>
Committed: Tue Apr 8 18:17:58 2014 -0500

----------------------------------------------------------------------
 .../cassandra/service/StorageService.java       | 39 +++-----------------
 1 file changed, 5 insertions(+), 34 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/76db70e9/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index ec446fb..9f8158f 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -645,39 +645,10 @@ public class StorageService extends NotificationBroadcasterSupport implements
IE
 
     private void prepareToJoin() throws ConfigurationException
     {
-        joined = true;
-
-        Collection<Token> tokens = null;
-        Map<ApplicationState, VersionedValue> appStates = new HashMap<>();
-
-        if (DatabaseDescriptor.getReplaceTokens().size() > 0 || DatabaseDescriptor.getReplaceNode()
!= null)
-            throw new RuntimeException("Replace method removed; use cassandra.replace_address
instead");
-        if (DatabaseDescriptor.isReplacing())
-        {
-            if (!DatabaseDescriptor.isAutoBootstrap())
-                throw new RuntimeException("Trying to replace_address with auto_bootstrap
disabled will not work, check your configuration");
-            tokens = prepareReplacementInfo();
-            appStates.put(ApplicationState.STATUS, valueFactory.hibernate(true));
-            appStates.put(ApplicationState.TOKENS, valueFactory.tokens(tokens));
-        }
-        else if (shouldBootstrap() && !joined)
+        if (!joined)
         {
-            // have to start the gossip service before we can see any info on other nodes.
 this is necessary
-            // for bootstrap to get the load info it needs.
-            // (we won't be part of the storage ring though until we add a counterId to our
state, below.)
-            // Seed the host ID-to-endpoint map with our own ID.
-            getTokenMetadata().updateHostId(SystemKeyspace.getLocalHostId(), FBUtilities.getBroadcastAddress());
-            appStates.put(ApplicationState.NET_VERSION, valueFactory.networkVersion());
-            appStates.put(ApplicationState.HOST_ID, valueFactory.hostId(SystemKeyspace.getLocalHostId()));
-            appStates.put(ApplicationState.RPC_ADDRESS, valueFactory.rpcaddress(DatabaseDescriptor.getBroadcastRpcAddress()));
-            appStates.put(ApplicationState.RELEASE_VERSION, valueFactory.releaseVersion());
-            logger.info("Starting up server gossip");
-            Gossiper.instance.register(this);
-            Gossiper.instance.start(SystemKeyspace.incrementAndGetGeneration(), appStates);
// needed for node-ring gathering.
-            // gossip snitch infos (local DC and rack)
-            gossipSnitchInfo();
-            // gossip Schema.emptyVersion forcing immediate check for schema updates (see
MigrationManager#maybeScheduleSchemaPull)
-            Schema.instance.updateVersionAndAnnounce(); // Ensure we know our own actual
Schema UUID in preparation for updates
+            Map<ApplicationState, VersionedValue> appStates = new HashMap<>();
+
             if (DatabaseDescriptor.isReplacing() && !(Boolean.parseBoolean(System.getProperty("cassandra.join_ring",
"true"))))
                 throw new ConfigurationException("Cannot set both join_ring=false and attempt
to replace a node");
             if (DatabaseDescriptor.getReplaceTokens().size() > 0 || DatabaseDescriptor.getReplaceNode()
!= null)
@@ -694,6 +665,7 @@ public class StorageService extends NotificationBroadcasterSupport implements
IE
             {
                 checkForEndpointCollision();
             }
+
             // have to start the gossip service before we can see any info on other nodes.
 this is necessary
             // for bootstrap to get the load info it needs.
             // (we won't be part of the storage ring though until we add a counterId to our
state, below.)
@@ -701,7 +673,7 @@ public class StorageService extends NotificationBroadcasterSupport implements
IE
             getTokenMetadata().updateHostId(SystemKeyspace.getLocalHostId(), FBUtilities.getBroadcastAddress());
             appStates.put(ApplicationState.NET_VERSION, valueFactory.networkVersion());
             appStates.put(ApplicationState.HOST_ID, valueFactory.hostId(SystemKeyspace.getLocalHostId()));
-            appStates.put(ApplicationState.RPC_ADDRESS, valueFactory.rpcaddress(DatabaseDescriptor.getRpcAddress()));
+            appStates.put(ApplicationState.RPC_ADDRESS, valueFactory.rpcaddress(DatabaseDescriptor.getBroadcastRpcAddress()));
             appStates.put(ApplicationState.RELEASE_VERSION, valueFactory.releaseVersion());
             logger.info("Starting up server gossip");
             Gossiper.instance.register(this);
@@ -711,7 +683,6 @@ public class StorageService extends NotificationBroadcasterSupport implements
IE
             // gossip Schema.emptyVersion forcing immediate check for schema updates (see
MigrationManager#maybeScheduleSchemaPull)
             Schema.instance.updateVersionAndAnnounce(); // Ensure we know our own actual
Schema UUID in preparation for updates
 
-
             if (!MessagingService.instance().isListening())
                 MessagingService.instance().listen(FBUtilities.getLocalAddress());
             LoadBroadcaster.instance.startBroadcasting();


Mime
View raw message