From cffb1b22d5df7300ec411d2b620bf3c4a08351cd Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sat, 12 Jan 2013 09:15:16 -0800 Subject: [PATCH] osd/PG: introduce flags to indicate explicitly requested scrubs Signed-off-by: Sage Weil (cherry picked from commit 1441095d6babfacd781929e8a54ed2f8a4444467) --- src/osd/PG.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/osd/PG.h b/src/osd/PG.h index cf9a26d2d27d6..9d5983ef94ae3 100644 --- a/src/osd/PG.h +++ b/src/osd/PG.h @@ -814,6 +814,7 @@ public: epoch_start(0), block_writes(false), active(false), queue_snap_trim(false), waiting_on(0), errors(0), fixed(0), active_rep_scrub(0), + must_scrub(false), must_deep_scrub(false), must_repair(false), finalizing(false), is_chunky(false), state(INACTIVE), deep(false) { @@ -837,6 +838,9 @@ public: MOSDRepScrub *active_rep_scrub; utime_t scrub_reg_stamp; // stamp we registered for + // flags to indicate explicitly requested scrubs (by admin) + bool must_scrub, must_deep_scrub, must_repair; + // Maps from objects with erros to missing/inconsistent peers map > missing; map > inconsistent; @@ -928,6 +932,10 @@ public: } received_maps.clear(); + must_scrub = false; + must_deep_scrub = false; + must_repair = false; + state = PG::Scrubber::INACTIVE; start = hobject_t(); end = hobject_t(); -- 2.39.5