bahman/scylla
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

sstables_manager: maybe_reclaim_components: yield between iterations

Browse Source 
Signed-off-by: Lakshmi Narayanan Sreethar <lakshmi.sreethar@scylladb.com>
This commit is contained in:
Lakshmi Narayanan Sreethar
2025-02-03 15:13:29 +05:30
parent 77107ddaa3
commit 10fffcd646
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sstables/sstables_manager.cc
View File

@@ -157,7 +157,7 @@ void sstables_manager::increment_total_reclaimable_memory(sstable* sst) {
_components_memory_change_event.signal();
}
void sstables_manager::maybe_reclaim_components() {
future<> sstables_manager::maybe_reclaim_components() {
while(_total_reclaimable_memory > get_components_memory_reclaim_threshold()) {
// Memory consumption is above threshold. Reclaim from the SSTable that
// has the most reclaimable memory to get the total consumption under limit.
@@ -174,6 +174,7 @@ void sstables_manager::maybe_reclaim_components() {
smlogger.info("Reclaimed {} bytes of memory from components of {}. Total memory reclaimed so far is {} bytes",
memory_reclaimed, sst_with_max_memory->get_filename(), _total_memory_reclaimed);
}
co_await coroutine::maybe_yield();
}
size_t sstables_manager::get_components_memory_reclaim_threshold() const {
@@ -197,7 +198,7 @@ future<> sstables_manager::components_reclaim_reload_fiber() {
if (_total_reclaimable_memory > get_components_memory_reclaim_threshold()) {
// reclaim memory to bring total memory usage under threshold
maybe_reclaim_components();
co_await maybe_reclaim_components();
} else {
// memory available for reloading components of previously reclaimed SSTables
co_await maybe_reload_components();

2
sstables/sstables_manager.hh
View File

@@ -217,7 +217,7 @@ private:
// Fiber to reload reclaimed components back into memory when memory becomes available.
future<> components_reclaim_reload_fiber();
// Reclaims components from SSTables if total memory usage exceeds the threshold.
void maybe_reclaim_components();
future<> maybe_reclaim_components();
// Reloads components from reclaimed SSTables if memory is available.
future<> maybe_reload_components();
size_t get_components_memory_reclaim_threshold() const;