diff --git a/gms/gossiper.cc b/gms/gossiper.cc index a172a1d321..89cd011a39 100644 --- a/gms/gossiper.cc +++ b/gms/gossiper.cc @@ -1824,9 +1824,6 @@ future<> gossiper::start_gossiping(int generation_nbr, std::mapgossiper_starting(); - logger.trace("gossip started with generation {}", generation); _enabled = true; _nr_run = 0; diff --git a/locator/ec2_multi_region_snitch.cc b/locator/ec2_multi_region_snitch.cc index e33bb1d675..b314132691 100644 --- a/locator/ec2_multi_region_snitch.cc +++ b/locator/ec2_multi_region_snitch.cc @@ -97,16 +97,6 @@ void ec2_multi_region_snitch::set_local_private_addr(const sstring& addr_str) { _local_private_address = addr_str; } -future<> ec2_multi_region_snitch::gossiper_starting() { - // - // Note: currently gossiper "main" instance always runs on CPU0 therefore - // this function will be executed on CPU0 only. - // - - _gossip_started = true; - return make_ready_future<>(); -} - std::list> ec2_multi_region_snitch::get_app_states() const { return { {gms::application_state::DC, gms::versioned_value::datacenter(_my_dc)}, diff --git a/locator/ec2_multi_region_snitch.hh b/locator/ec2_multi_region_snitch.hh index 70235b70f3..a8e0a4ce28 100644 --- a/locator/ec2_multi_region_snitch.hh +++ b/locator/ec2_multi_region_snitch.hh @@ -16,7 +16,6 @@ namespace locator { class ec2_multi_region_snitch : public ec2_snitch { public: ec2_multi_region_snitch(const sstring& fname = "", unsigned io_cpu_id = 0); - virtual future<> gossiper_starting() override; virtual std::list> get_app_states() const override; virtual future<> start() override; virtual void set_local_private_addr(const sstring& addr_str) override; diff --git a/locator/gossiping_property_file_snitch.cc b/locator/gossiping_property_file_snitch.cc index b56a9c87c5..f12de13c5a 100644 --- a/locator/gossiping_property_file_snitch.cc +++ b/locator/gossiping_property_file_snitch.cc @@ -102,15 +102,6 @@ void gossiping_property_file_snitch::periodic_reader_callback() { }); } -future<> gossiping_property_file_snitch::gossiper_starting() { - // - // Note: currently gossiper "main" instance always runs on CPU0 therefore - // this function will be executed on CPU0 only. - // - _gossip_started = true; - return make_ready_future<>(); -} - std::list> gossiping_property_file_snitch::get_app_states() const { sstring ip = format("{}", gms::get_local_gossiper().get_local_messaging().listen_address()); return { diff --git a/locator/gossiping_property_file_snitch.hh b/locator/gossiping_property_file_snitch.hh index 5c5dccaea7..33c49a297a 100644 --- a/locator/gossiping_property_file_snitch.hh +++ b/locator/gossiping_property_file_snitch.hh @@ -36,7 +36,6 @@ public: return std::chrono::seconds(60); } - virtual future<> gossiper_starting() override; virtual std::list> get_app_states() const override; virtual future<> stop() override; virtual future<> start() override; diff --git a/locator/snitch_base.hh b/locator/snitch_base.hh index dcfd3ef724..7161fba839 100644 --- a/locator/snitch_base.hh +++ b/locator/snitch_base.hh @@ -87,15 +87,6 @@ public: virtual int compare_endpoints( inet_address& target, inet_address& a1, inet_address& a2) = 0; - /** - * called after Gossiper instance exists immediately before it starts - * gossiping - */ - virtual future<> gossiper_starting() { - _gossip_started = true; - return make_ready_future<>(); - } - /** * returns whatever info snitch wants to gossip */ @@ -168,10 +159,6 @@ public: //noop by default } - bool local_gossiper_started() { - return _gossip_started; - } - virtual future<> reload_gossiper_state() { // noop by default return make_ready_future<>(); @@ -202,7 +189,6 @@ protected: stopping, stopped } _state = snitch_state::initializing; - bool _gossip_started = false; }; struct snitch_ptr {