From ad4e4e9ee48c6ba2d171449f74cb98958848b6f3 Mon Sep 17 00:00:00 2001 From: Calle Wilund Date: Tue, 29 Jun 2021 14:39:37 +0000 Subject: [PATCH] commitlog: coroutinize segment_manager::clear_reserve_segments --- db/commitlog/commitlog.cc | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/db/commitlog/commitlog.cc b/db/commitlog/commitlog.cc index 520754dc62..84c69ce553 100644 --- a/db/commitlog/commitlog.cc +++ b/db/commitlog/commitlog.cc @@ -1699,14 +1699,11 @@ future<> db::commitlog::segment_manager::clear_reserve_segments() { tmp.emplace_back(std::move(s)); return true; }); - - auto i = tmp.begin(); - auto e = tmp.end(); - - return parallel_for_each(i, e, [this](const sstring& filename) { + + co_await parallel_for_each(tmp, [this](const sstring& filename) { clogger.debug("Deleting recycled segment file {}", filename); return delete_file(filename); - }).finally([this, tmp = std::move(tmp)] { + }).finally([this] { return do_pending_deletes(); }); }