cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbros...@apache.org
Subject [3/4] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Tue, 20 May 2014 01:23:59 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1


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

Branch: refs/heads/trunk
Commit: c0e94ae601f51bda2bbf0fa3f5ea67ce1746502f
Parents: 0f706c5 4f4b5dd
Author: Dave Brosius <dbrosius@mebigfatguy.com>
Authored: Mon May 19 21:22:10 2014 -0400
Committer: Dave Brosius <dbrosius@mebigfatguy.com>
Committed: Mon May 19 21:22:10 2014 -0400

----------------------------------------------------------------------
 src/java/org/apache/cassandra/service/StorageService.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0e94ae6/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index 59df759,567bb19..e29530a
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -676,10 -660,11 +676,11 @@@ public class StorageService extends Not
              // 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());
+             UUID localHostId = SystemKeyspace.getLocalHostId();
+             getTokenMetadata().updateHostId(localHostId, FBUtilities.getBroadcastAddress());
              appStates.put(ApplicationState.NET_VERSION, valueFactory.networkVersion());
-             appStates.put(ApplicationState.HOST_ID, valueFactory.hostId(SystemKeyspace.getLocalHostId()));
+             appStates.put(ApplicationState.HOST_ID, valueFactory.hostId(localHostId));
 -            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);


Mime
View raw message