From afd44a6e082a43fbb26d609341d62d609428ea4e Mon Sep 17 00:00:00 2001 From: Vlad Zolotarov Date: Thu, 8 Oct 2015 13:43:04 +0300 Subject: [PATCH] locator::gossiping_property_file_snitch: initialize i_endpoint_snitch::io_cpu_id() in the constructor This is just cleaner. Signed-off-by: Vlad Zolotarov --- locator/gossiping_property_file_snitch.cc | 10 ++++++---- locator/gossiping_property_file_snitch.hh | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/locator/gossiping_property_file_snitch.cc b/locator/gossiping_property_file_snitch.cc index bc1d231038..f6f95ceb99 100644 --- a/locator/gossiping_property_file_snitch.cc +++ b/locator/gossiping_property_file_snitch.cc @@ -62,8 +62,12 @@ future gossiping_property_file_snitch::property_file_was_modified() { } gossiping_property_file_snitch::gossiping_property_file_snitch( - const sstring& fname, unsigned io_cpu_id) -: production_snitch_base(fname), _file_reader_cpu_id(io_cpu_id) {} + const sstring& fname, unsigned io_cpuid) +: production_snitch_base(fname), _file_reader_cpu_id(io_cpuid) { + if (engine().cpu_id() == _file_reader_cpu_id) { + io_cpu_id() = _file_reader_cpu_id; + } +} future<> gossiping_property_file_snitch::start() { using namespace std::chrono_literals; @@ -82,8 +86,6 @@ future<> gossiping_property_file_snitch::start() { periodic_reader_callback(); }); - io_cpu_id() = _file_reader_cpu_id; - return read_property_file().then([this] { start_io(); set_snitch_ready(); diff --git a/locator/gossiping_property_file_snitch.hh b/locator/gossiping_property_file_snitch.hh index 9ad8941057..fd675ba536 100644 --- a/locator/gossiping_property_file_snitch.hh +++ b/locator/gossiping_property_file_snitch.hh @@ -76,7 +76,7 @@ public: gossiping_property_file_snitch( const sstring& fname = snitch_properties_filename, - unsigned io_cpu_id = 0); + unsigned io_cpuid = 0); private: void periodic_reader_callback();