crimson/osd: adapt to the scrub refactory in classic osd

Fixing Crimson compilation.

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>

diff --git a/src/crimson/osd/pg.cc b/src/crimson/osd/pg.cc
index 812b31bb8a837a625e91fd2b1fa11451fcfd3f88..e9dd078de6c9163dc18899df4d582272dbba2c02 100644 (file)
--- 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 feefb6d70d0cbfea175588ec790b85385b236b3b..88d39fde9ad4365946556db61b9b77161b061702 100644 (file)
--- 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;