mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-04-25 11:00:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

storage_service: Implement join_ring

Browse Source 
Join the ring by operator request.
This commit is contained in:
Asias He
2015-08-11 10:51:54 +08:00
parent 3ea91504ba
commit 645700d261
2 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
service/storage_service.cc
View File

@@ -314,28 +314,21 @@ future<> storage_service::join_token_ring(int delay) {
});
}
void storage_service::join_ring() {
#if 0
if (!joined) {
future<> storage_service::join_ring() {
if (!_joined) {
logger.info("Joining ring by operator request");
try
{
joinTokenRing(0);
}
catch (ConfigurationException e)
{
throw new IOException(e.getMessage());
}
return join_token_ring(0);
} else if (_is_survey_mode) {
set_tokens(SystemKeyspace.getSavedTokens());
SystemKeyspace.setBootstrapState(SystemKeyspace.BootstrapState.COMPLETED);
_is_survey_mode = false;
logger.info("Leaving write survey mode and joining ring at operator request");
assert _token_metadata.sortedTokens().size() > 0;
Auth.setup();
return set_tokens(db::system_keyspace::get_saved_tokens()).then([this] {
//SystemKeyspace.setBootstrapState(SystemKeyspace.BootstrapState.COMPLETED);
_is_survey_mode = false;
logger.info("Leaving write survey mode and joining ring at operator request");
assert(_token_metadata.sorted_tokens().size() > 0);
//Auth.setup();
return make_ready_future<>();
});
}
#endif
return make_ready_future<>();
}
future<> storage_service::bootstrap(std::unordered_set<token> tokens) {

2
service/storage_service.hh
View File

@@ -371,7 +371,7 @@ private:
future<> prepare_to_join();
future<> join_token_ring(int delay);
public:
void join_ring();
future<> join_ring();
bool is_joined() {
return _joined;
}