From d196b034e2bdc1e2ee9f468fa7bc8084f62a666c Mon Sep 17 00:00:00 2001 From: Vlad Zolotarov Date: Mon, 27 Jul 2015 10:10:58 +0300 Subject: [PATCH] locator::snitch_base: Add a default snitch_base::stop() method Signed-off-by: Vlad Zolotarov --- locator/rack_inferring_snitch.hh | 6 ------ locator/simple_snitch.hh | 6 ------ locator/snitch_base.hh | 6 +++++- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/locator/rack_inferring_snitch.hh b/locator/rack_inferring_snitch.hh index 081b53edb4..9865ceda76 100644 --- a/locator/rack_inferring_snitch.hh +++ b/locator/rack_inferring_snitch.hh @@ -68,12 +68,6 @@ struct rack_inferring_snitch : public snitch_base { return std::to_string((endpoint.raw_addr() >> 16) & 0xFF); } - // noop - virtual future<> stop() override { - _state = snitch_state::stopped; - return make_ready_future<>(); - } - virtual sstring get_name() const override { return "org.apache.cassandra.locator.RackInferringSnitch"; } diff --git a/locator/simple_snitch.hh b/locator/simple_snitch.hh index 18cb2cdfa6..b68d84b98c 100644 --- a/locator/simple_snitch.hh +++ b/locator/simple_snitch.hh @@ -88,12 +88,6 @@ struct simple_snitch : public snitch_base { return 0; } - // noop - virtual future<> stop() override { - _state = snitch_state::stopped; - return make_ready_future<>(); - } - virtual sstring get_name() const override { return "org.apache.cassandra.locator.SimpleSnitch"; } diff --git a/locator/snitch_base.hh b/locator/snitch_base.hh index 1767aeaa70..96fecf6741 100644 --- a/locator/snitch_base.hh +++ b/locator/snitch_base.hh @@ -116,7 +116,11 @@ public: virtual ~i_endpoint_snitch() { assert(_state == snitch_state::stopped); }; - virtual future<> stop() = 0; + // noop by default + virtual future<> stop() { + _state = snitch_state::stopped; + return make_ready_future<>(); + } // noop by default virtual future<> pause_io() {