From 37adcd3ecf7cedc9336f6bec864dcbca105a91c8 Mon Sep 17 00:00:00 2001 From: Benny Halevy Date: Wed, 20 Mar 2024 12:52:50 +0200 Subject: [PATCH] storage_service: add my_host_id Shorthand for getting this node's host_id from token_metadata.topology, similar to the `get_broadcast_address` helper. Signed-off-by: Benny Halevy --- service/storage_service.cc | 2 +- service/storage_service.hh | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/service/storage_service.cc b/service/storage_service.cc index 45c02090d9..07eb28303c 100644 --- a/service/storage_service.cc +++ b/service/storage_service.cc @@ -6701,7 +6701,7 @@ future<> storage_service::start_maintenance_mode() { set_mode(mode::MAINTENANCE); return mutate_token_metadata([this] (mutable_token_metadata_ptr token_metadata) -> future<> { - return token_metadata->update_normal_tokens({ dht::token{} }, get_token_metadata_ptr()->get_topology().my_host_id()); + return token_metadata->update_normal_tokens({ dht::token{} }, my_host_id()); }, acquire_merge_lock::yes); } diff --git a/service/storage_service.hh b/service/storage_service.hh index 4b43a8c559..578105a137 100644 --- a/service/storage_service.hh +++ b/service/storage_service.hh @@ -284,6 +284,9 @@ private: inet_address get_broadcast_address() const noexcept { return get_token_metadata_ptr()->get_topology().my_address(); } + locator::host_id my_host_id() const noexcept { + return get_token_metadata_ptr()->get_topology().my_host_id(); + } bool is_me(inet_address addr) const noexcept { return get_token_metadata_ptr()->get_topology().is_me(addr); }