import 15.2.5

[ceph.git] / ceph / src / osd / PG.h

diff --git a/ceph/src/osd/PG.h b/ceph/src/osd/PG.h
index d187c3a630c20e740045bbd488c02e68738d307d..13f115b8b9bb8b2e26b70cebdd20bbf1e2860825 100644 (file)
--- a/ceph/src/osd/PG.h
+++ b/ceph/src/osd/PG.h
@@ -1130,7 +1130,7 @@ public:
     utime_t sleep_start;
 
     // flags to indicate explicitly requested scrubs (by admin)
-    bool must_scrub, must_deep_scrub, must_repair, need_auto;
+    bool must_scrub, must_deep_scrub, must_repair, need_auto, req_scrub;
 
     // Priority to use for scrub scheduling
     unsigned priority = 0;
@@ -1255,6 +1255,7 @@ public:
       must_deep_scrub = false;
       must_repair = false;
       need_auto = false;
+      req_scrub = false;
       time_for_deep = false;
       auto_repair = false;
       check_repair = false;
@@ -1291,6 +1292,7 @@ public:
 
 protected:
   bool scrub_after_recovery;
+  bool save_req_scrub; // Saved for scrub_after_recovery
 
   int active_pushes;
 
@@ -1310,6 +1312,7 @@ protected:
     const list<pair<ScrubMap::object, pg_shard_t> > &ok_peers,
     const set<pg_shard_t> &bad_peers);
 
+  void abort_scrub();
   void chunky_scrub(ThreadPool::TPHandle &handle);
   void scrub_compare_maps();
   /**