bahman/scylla
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

locator::gossiping_property_file_snitch: fix some issues in reload_configuration()

Browse Source 
- Invoke reload_gossiper_state() and gossip_snitch_info() on CPU0 since
     gossiper is effectively running on CPU0 therefore all methods
     modifying its state should be invoked on CPU0 as well.
   - Don't invoke any method on external "distributed" objects unless their
     corresponding per-shard service object have already been initialized.
   - Update a local Node info in a storage_service::token_metadata::topology
     when reloading snitch configuration when DC and/or Rack info has changed.

Signed-off-by: Vlad Zolotarov <vladz@cloudius-systems.com>
This commit is contained in:
Vlad Zolotarov
2015-10-28 19:55:06 +02:00
parent b3504f9b1f
commit 17294a3bc7
1 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
locator/gossiping_property_file_snitch.cc
View File

@@ -209,15 +209,34 @@ future<> gossiping_property_file_snitch::reload_configuration() {
local_s->set_my_rack(_my_rack);
}
}).then([this] {
reload_gossiper_state();
return seastar::async([this] {
// reload Gossiper state (executed on CPU0 only)
smp::submit_to(0, [this] {
this->reload_gossiper_state();
}).get();
return service::get_storage_service().invoke_on_all(
[] (service::storage_service& l) {
l.get_token_metadata().invalidate_cached_rings();
}).then([this] {
if (_gossip_started) {
service::get_local_storage_service().gossip_snitch_info();
}
// update Storage Service on each shard
auto cpus = boost::irange(0u, smp::count);
parallel_for_each(cpus.begin(), cpus.end(), [] (unsigned int c) {
return smp::submit_to(c, [] {
if (service::get_storage_service().local_is_initialized()) {
auto& tmd = service::get_local_storage_service().get_token_metadata();
// initiate the token metadata endpoints cache reset
tmd.invalidate_cached_rings();
// re-read local rack and DC info
tmd.update_topology(utils::fb_utilities::get_broadcast_address());
}
});
}).get();
// spread the word...
smp::submit_to(0, [this] {
if (this->_gossip_started && service::get_storage_service().local_is_initialized()) {
service::get_local_storage_service().gossip_snitch_info();
}
}).get();
});
});
}