Merge branch 'cassandra-1.1' into cassandra-1.2.0
Conflicts:
src/java/org/apache/cassandra/service/MigrationManager.java
src/java/org/apache/cassandra/service/StorageService.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/44545d38
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/44545d38
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/44545d38
Branch: refs/heads/cassandra-1.2
Commit: 44545d380d639926c2a5734b70d5165bd22b0ca7
Parents: f91001a 442a7b3
Author: Brandon Williams <[email protected]>
Authored: Fri Dec 7 15:43:42 2012 -0600
Committer: Brandon Williams <[email protected]>
Committed: Fri Dec 7 15:43:42 2012 -0600
----------------------------------------------------------------------
.../apache/cassandra/service/MigrationManager.java | 56 +++++++++------
.../apache/cassandra/service/StorageService.java | 5 +-
2 files changed, 38 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/44545d38/src/java/org/apache/cassandra/service/MigrationManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/44545d38/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/StorageService.java
index bc418f4,d041279..276136a
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@@ -522,16 -544,14 +522,17 @@@ public class StorageService implements
Gossiper.instance.register(this);
Gossiper.instance.register(migrationManager);
Gossiper.instance.start(SystemTable.incrementAndGetGeneration()); //
needed for node-ring gathering.
-
+ // gossip network proto version
+
Gossiper.instance.addLocalApplicationState(ApplicationState.NET_VERSION,
valueFactory.networkVersion());
+ Gossiper.instance.addLocalApplicationState(ApplicationState.HOST_ID,
valueFactory.hostId(SystemTable.getLocalHostId()));
+ // gossip snitch infos (local DC and rack)
+ gossipSnitchInfo();
- // gossip schema version when gossiper is running
- Schema.instance.updateVersionAndAnnounce();
+ // gossip Schema.emptyVersion forcing immediate check for schema
updates (see MigrationManager#maybeScheduleSchemaPull)
+ Schema.instance.updateVersion(); // Ensure we know our own actual
Schema UUID in preparation for updates
+ MigrationManager.passiveAnnounce(Schema.emptyVersion);
-
// add rpc listening info
Gossiper.instance.addLocalApplicationState(ApplicationState.RPC_ADDRESS,
valueFactory.rpcaddress(DatabaseDescriptor.getRpcAddress()));
- if (null != DatabaseDescriptor.getReplaceToken())
+ if (0 != DatabaseDescriptor.getReplaceTokens().size())
Gossiper.instance.addLocalApplicationState(ApplicationState.STATUS,
valueFactory.hibernate(true));
MessagingService.instance().listen(FBUtilities.getLocalAddress());
