From: Samuel Just <samuel.just@dreamhost.com>
Date: Mon, 21 Nov 2011 23:06:35 +0000 (-0800)
Subject: PG: it's not necessary to call build_inc_scrub_map in build_scrub_map
X-Git-Tag: v0.39~21
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=eb8d91feaf440a2d9bd8f54f3b72b61d73fc0fee;p=ceph-ci.git

PG: it's not necessary to call build_inc_scrub_map in build_scrub_map

Because we have called osr.flush(), it's safe to tag map.valid_through
as last_update.   We will still have to catch up once we have stopped
writes and allowed the filestore to catch up anyway.

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index d8548e029f0..aecffccc82c 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -2765,11 +2765,6 @@ void PG::build_scrub_map(ScrubMap &map)
 
   dout(10) << "PG relocked, finalizing" << dendl;
 
-  // Catch up
-  ScrubMap incr;
-  build_inc_scrub_map(incr, map.valid_through);
-  map.merge_incr(incr);
-
   // pg attrs
   osd->store->collection_getattrs(coll, map.attrs);