]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/PG: add set_last_scrub_stamp
authorSage Weil <sage@redhat.com>
Wed, 13 Sep 2017 21:16:06 +0000 (17:16 -0400)
committerDavid Zafman <dzafman@redhat.com>
Tue, 12 Feb 2019 02:01:50 +0000 (18:01 -0800)
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 3ca232e650f56385e86d278cb36261017667c672)

Conflicts:
src/osd/PG.h (trivial)

src/osd/OSD.cc
src/osd/PG.h

index 0f968d33364547d4e7729e8409849ec27a36a2d2..d277c4e650be3b1837c4c4453027ecac6f23f01e 100644 (file)
@@ -5642,7 +5642,7 @@ void TestOpsSocketHook::test_ops(OSDService *service, ObjectStore *store,
       utime_t stamp = ceph_clock_now();
       stamp -= scrub_max_interval;
       stamp -=  100.0;  // push back last scrub more for good measure
-      pg->info.history.last_scrub_stamp = stamp;
+      pg->set_last_scrub_stamp(stamp);
       pg->reg_next_scrub();
       ss << "ok";
     } else {
index d782d897fedffa8c4d73a1483e8969e3d6237886..e5ca592763636d02ad052b70d7427feeacb16bd0 100644 (file)
@@ -2496,6 +2496,9 @@ protected:
  public:
   const spg_t&      get_pgid() const { return pg_id; }
 
+  void set_last_scrub_stamp(utime_t t) {
+    info.history.last_scrub_stamp = t;
+  }
   void reset_min_peer_features() {
     peer_features = CEPH_FEATURES_SUPPORTED_DEFAULT;
   }