From 34f8762c4d52a8971cb133c8b07fc07ab4eeaba5 Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Thu, 26 Dec 2019 12:12:10 +0300 Subject: [PATCH] storage_service: Drop _update_jobs This field is write-only. Leftover from 83ffae1 (storage_service: Drop block_until_update_pending_ranges_finished) Signed-off-by: Pavel Emelyanov Message-Id: <20191226091210.20966-1-xemul@scylladb.com> --- service/storage_service.cc | 5 +---- service/storage_service.hh | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/service/storage_service.cc b/service/storage_service.cc index fbca3a6109..4308568bbc 100644 --- a/service/storage_service.cc +++ b/service/storage_service.cc @@ -3165,12 +3165,9 @@ future<> storage_service::do_update_pending_ranges() { future<> storage_service::update_pending_ranges() { return get_storage_service().invoke_on(0, [] (auto& ss){ - ss._update_jobs++; return ss._update_pending_ranges_action.trigger_later().then([&ss] { // calculate_pending_ranges will modify token_metadata, we need to repliate to other cores - return ss.replicate_to_all_cores().finally([&ss, ss0 = ss.shared_from_this()] { - ss._update_jobs--; - }); + return ss.replicate_to_all_cores().then([s = ss.shared_from_this()] { }); }); }); } diff --git a/service/storage_service.hh b/service/storage_service.hh index 57e1ad0a7e..a89c058c87 100644 --- a/service/storage_service.hh +++ b/service/storage_service.hh @@ -151,7 +151,6 @@ private: gms::gossiper& _gossiper; sharded& _auth_service; sharded& _cql_config; - int _update_jobs{0}; // Note that this is obviously only valid for the current shard. Users of // this facility should elect a shard to be the coordinator based on any // given objective criteria