From f73b6abcc76f8e92c483dff709603fe0dfba6848 Mon Sep 17 00:00:00 2001 From: Lakshmi Narayanan Sreethar Date: Thu, 30 Jan 2025 17:42:01 +0530 Subject: [PATCH] sstables_manager: rename `_sstable_deleted_event` condition variable Rename the `_sstable_deleted_event` condition variable to `_components_memory_change_event` as it will be used by future patches to signal changes in sstable component memory consumption, (i.e.) during sstable create and delete, and also when the `components_memory_reclaim_threshold` config value is changed. Signed-off-by: Lakshmi Narayanan Sreethar --- sstables/sstables_manager.cc | 6 +++--- sstables/sstables_manager.hh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sstables/sstables_manager.cc b/sstables/sstables_manager.cc index db755b1e4c..bd76a4bbe5 100644 --- a/sstables/sstables_manager.cc +++ b/sstables/sstables_manager.cc @@ -189,7 +189,7 @@ future<> sstables_manager::components_reclaim_reload_fiber() { sstlog.trace("components_reloader_fiber start"); while (true) { - co_await _sstable_deleted_event.when(); + co_await _components_memory_change_event.when(); if (_closing) { co_return; @@ -269,7 +269,7 @@ void sstables_manager::deactivate(sstable* sst) { void sstables_manager::remove(sstable* sst) { _undergoing_close.erase(_undergoing_close.iterator_to(*sst)); delete sst; - _sstable_deleted_event.signal(); + _components_memory_change_event.signal(); maybe_done(); } @@ -304,7 +304,7 @@ future<> sstables_manager::close() { co_await _done.get_future(); co_await _sstable_metadata_concurrency_sem.stop(); // stop the components reload fiber - _sstable_deleted_event.signal(); + _components_memory_change_event.signal(); co_await std::move(_components_reloader_status); } diff --git a/sstables/sstables_manager.hh b/sstables/sstables_manager.hh index a88ba6646c..f7418e29a2 100644 --- a/sstables/sstables_manager.hh +++ b/sstables/sstables_manager.hh @@ -108,8 +108,8 @@ private: size_t _total_memory_reclaimed{0}; // Set of sstables from which memory has been reclaimed set_type _reclaimed; - // Condition variable that gets notified when an sstable is deleted - seastar::condition_variable _sstable_deleted_event; + // Condition variable that needs to be notified when an sstable is created or deleted + seastar::condition_variable _components_memory_change_event; future<> _components_reloader_status = make_ready_future<>(); bool _closing = false;