From 52a94580308f75cdc8eec69fd7c70a2731521b3b Mon Sep 17 00:00:00 2001 From: Ronen Friedman Date: Mon, 16 Nov 2020 20:02:35 +0200 Subject: [PATCH] crimson/osd: adapt to the scrub refactory in classic osd Fixing Crimson compilation. Signed-off-by: Ronen Friedman --- src/crimson/osd/pg.cc | 6 +++--- src/crimson/osd/pg.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/crimson/osd/pg.cc b/src/crimson/osd/pg.cc index 812b31bb8a8..e9dd078de6c 100644 --- a/src/crimson/osd/pg.cc +++ b/src/crimson/osd/pg.cc @@ -316,15 +316,15 @@ ghobject_t PG::do_delete_work(ceph::os::Transaction &t, return _next; } -void PG::scrub_requested(bool deep, bool repair, bool need_auto) +void PG::scrub_requested(scrub_level_t scrub_level, scrub_type_t scrub_type) { // TODO: should update the stats upon finishing the scrub - peering_state.update_stats([deep, this](auto& history, auto& stats) { + peering_state.update_stats([scrub_level, this](auto& history, auto& stats) { const utime_t now = ceph_clock_now(); history.last_scrub = peering_state.get_info().last_update; history.last_scrub_stamp = now; history.last_clean_scrub_stamp = now; - if (deep) { + if (scrub_level == scrub_level_t::deep) { history.last_deep_scrub = history.last_scrub; history.last_deep_scrub_stamp = now; } diff --git a/src/crimson/osd/pg.h b/src/crimson/osd/pg.h index feefb6d70d0..88d39fde9ad 100644 --- a/src/crimson/osd/pg.h +++ b/src/crimson/osd/pg.h @@ -151,7 +151,7 @@ public: // Not needed yet -- mainly for scrub scheduling } - void scrub_requested(bool deep, bool repair, bool need_auto = false) final; + void scrub_requested(scrub_level_t scrub_level, scrub_type_t scrub_type) final; uint64_t get_snap_trimq_size() const final { return 0; -- 2.47.3