mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-04-22 09:30:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

storage_service: Enable _is_survey_mode logic in join_token_ring

Browse Source
This commit is contained in:
Asias He
2015-08-11 11:30:12 +08:00
parent 6874663c9d
commit 951c0d192b
1 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
service/storage_service.cc
View File

@@ -287,30 +287,28 @@ future<> storage_service::join_token_ring(int delay) {
}
}
}
set_tokens(_bootstrap_tokens).get();
#if 0
// if we don't have system_traces keyspace at this point, then create it manually
if (Schema.instance.getKSMetaData(TraceKeyspace.NAME) == null)
MigrationManager.announceNewKeyspace(TraceKeyspace.definition(), 0, false);
#endif
if (!_is_survey_mode)
{
if (!_is_survey_mode) {
// start participating in the ring.
SystemKeyspace.setBootstrapState(SystemKeyspace.BootstrapState.COMPLETED);
set_tokens(_bootstrap_tokens);
//SystemKeyspace.setBootstrapState(SystemKeyspace.BootstrapState.COMPLETED);
set_tokens(_bootstrap_tokens).get();
// remove the existing info about the replaced node.
if (!current.isEmpty())
for (InetAddress existing : current)
Gossiper.instance.replacedEndpoint(existing);
assert _token_metadata.sortedTokens().size() > 0;
Auth.setup();
}
else
{
if (!current.empty()) {
auto& gossiper = gms::get_local_gossiper();
for (auto existing : current) {
gossiper.replaced_endpoint(existing);
}
}
assert(_token_metadata.sorted_tokens().size() > 0);
//Auth.setup();
} else {
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
});
}