mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-06-02 13:06:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

storage_service: Enable is_ready_for_bootstrap in join_token_ring

Browse Source 
The goal is to make sure our schema matches with other nodes in the
cluster.
This commit is contained in:
Asias He
2015-11-18 15:55:16 +08:00
committed by Pekka Enberg
parent bb1470f0d4
commit 269ea7f81b
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
service/storage_service.cc
View File

@@ -244,15 +244,12 @@ void storage_service::join_token_ring(int delay) {
}
sleep(std::chrono::seconds(1)).get();
}
#if 0
// if our schema hasn't matched yet, keep sleeping until it does
// (post CASSANDRA-1391 we don't expect this to be necessary very often, but it doesn't hurt to be careful)
while (!MigrationManager.isReadyForBootstrap())
{
while (!get_local_migration_manager().is_ready_for_bootstrap()) {
set_mode(mode::JOINING, "waiting for schema information to complete", true);
Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS);
sleep(std::chrono::seconds(1)).get();
}
#endif
set_mode(mode::JOINING, "schema complete, ready to bootstrap", true);
set_mode(mode::JOINING, "waiting for pending range calculation", true);
get_local_pending_range_calculator_service().block_until_finished().get();