]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/PG: remove useless osd_scrub_min_interval check
authorSage Weil <sage@inktank.com>
Mon, 14 Jan 2013 04:27:59 +0000 (20:27 -0800)
committerSage Weil <sage@inktank.com>
Tue, 15 Jan 2013 02:24:40 +0000 (18:24 -0800)
This was already a no-op: we don't call PG::scrub_sched() unless it has
been osd_scrub_max_interval seconds since we last scrubbed.  Unless we
explicitly requested in, in which case we don't want this check anyway.

Signed-off-by: Sage Weil <sage@inktank.com>
src/osd/PG.cc

index 77b126e95ecdce216760c5745e3b5289e7f93ec9..5608148d70199962b74aa3abc6a44e2d66f47a05 100644 (file)
@@ -3014,12 +3014,6 @@ bool PG::sched_scrub()
     return false;
   }
 
-  // just scrubbed?
-  if (info.history.last_scrub_stamp + g_conf->osd_scrub_min_interval > ceph_clock_now(g_ceph_context)) {
-    dout(20) << "sched_scrub: just scrubbed, skipping" << dendl;
-    return false;
-  }
-
   bool ret = true;
   if (!scrubber.reserved) {
     assert(scrubber.reserved_peers.empty());