From 1c2df841c2d65357d9414eaef3d2329bec30e3fb Mon Sep 17 00:00:00 2001 From: Vitaliy Filippov Date: Sat, 17 Jun 2023 17:01:11 +0300 Subject: [PATCH] Fix failed assert(!scrub_list_op) on OSD restart with pending scrubs --- src/osd_scrub.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/osd_scrub.cpp b/src/osd_scrub.cpp index 772cc9b6..de3ee117 100644 --- a/src/osd_scrub.cpp +++ b/src/osd_scrub.cpp @@ -115,6 +115,10 @@ int osd_t::pick_next_scrub(object_id & next_oid) } return 0; } + if (scrub_list_op) + { + return 1; + } timespec tv_now; clock_gettime(CLOCK_REALTIME, &tv_now); bool rescan = scrub_last_pg.pool_id != 0 || scrub_last_pg.pg_num != 0;