mirrors/scylladb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

storage_service: Start gossiper inside prepare_to_join

Browse Source
This commit is contained in:
Asias He
2015-05-26 16:48:14 +08:00
parent 93f4ba820e
commit e98ec068ca
2 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
main.cc
View File

@@ -46,12 +46,8 @@ future<> init_messaging_service(auto listen_address, auto seed_provider) {
return gms::get_gossiper().start_single().then([seeds] {
auto& gossiper = gms::get_local_gossiper();
gossiper.set_seeds(seeds);
using namespace std::chrono;
auto now = high_resolution_clock::now().time_since_epoch();
int generation_number = duration_cast<seconds>(now).count();
return gossiper.start(generation_number).then([] {
print("Start gossiper service ...\n");
});
auto& ss = service::get_local_storage_service();
return ss.init_server();
});
});
});

26
service/storage_service.hh
View File

@@ -418,13 +418,11 @@ private:
}
#endif
public:
void init_server()
{
init_server(RING_DELAY);
future<> init_server() {
return init_server(RING_DELAY);
}
void init_server(int delay)
{
future<> init_server(int delay) {
#if 0
logger.info("Cassandra version: {}", FBUtilities.getReleaseVersionString());
logger.info("Thrift API version: {}", cassandraConstants.VERSION);
@@ -522,8 +520,10 @@ public:
}, "StorageServiceShutdownHook");
Runtime.getRuntime().addShutdownHook(drainOnShutdown);
#endif
prepare_to_join();
join_token_ring(delay);
return prepare_to_join().then([this, delay] {
join_token_ring(delay);
return make_ready_future<>();
});
#if 0
// Has to be called after the host id has potentially changed in prepareToJoin().
for (ColumnFamilyStore cfs : ColumnFamilyStore.all())
@@ -566,7 +566,7 @@ public:
}
#endif
private:
void prepare_to_join()
future<> prepare_to_join()
{
if (!joined) {
std::map<gms::application_state, gms::versioned_value> app_states;
@@ -611,7 +611,13 @@ private:
auto& gossiper = gms::get_local_gossiper();
gossiper.register_(this);
gossiper.start(0/*SystemKeyspace.incrementAndGetGeneration()*/, app_states);
using namespace std::chrono;
auto now = high_resolution_clock::now().time_since_epoch();
int generation_number = duration_cast<seconds>(now).count();
// FIXME: SystemKeyspace.incrementAndGetGeneration()
return gossiper.start(generation_number, app_states).then([] {
print("Start gossiper service ...\n");
});
#if 0
// gossip snitch infos (local DC and rack)
gossipSnitchInfo();
@@ -626,7 +632,9 @@ private:
BatchlogManager.instance.start();
#endif
}
return make_ready_future<>();
}
void join_token_ring(int delay) {
#if 0
joined = true;