mirrors/scylladb
1
0
Fork 0
mirror of https://github.com/scylladb/scylladb.git synced 2026-05-12 19:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

compaction_manager: perform_cleanup: ignore condition_variable_timed_out

Browse Source 
The polling loop was intended to ignore
`condition_variable_timed_out` and check for progress
using a longer `max_idle_duration` timeout in the loop.

Fixes #15669

Signed-off-by: Benny Halevy <bhalevy@scylladb.com>

Closes scylladb/scylladb#15671
This commit is contained in:
Benny Halevy
2023-10-09 10:40:12 +03:00
committed by Nadav Har'El
parent 8d618bbfc6
commit 68a7bbe582
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
compaction/compaction_manager.cc
View File

@@ -1816,7 +1816,11 @@ future<> compaction_manager::perform_cleanup(owned_ranges_ptr sorted_owned_range
};
cmlog.debug("perform_cleanup: waiting for sstables to become eligible for cleanup");
co_await t.get_staging_done_condition().when(sleep_duration, [&] { return has_sstables_eligible_for_compaction(); });
try {
co_await t.get_staging_done_condition().when(sleep_duration, [&] { return has_sstables_eligible_for_compaction(); });
} catch (const seastar::condition_variable_timed_out&) {
// Ignored. Keep retrying for max_idle_duration
}
if (!has_sstables_eligible_for_compaction()) {
continue;