summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Just <samuel.just@dreamhost.com>2011-11-21 15:06:35 -0800
committerSamuel Just <samuel.just@dreamhost.com>2011-11-21 17:46:21 -0800
commiteb8d91feaf440a2d9bd8f54f3b72b61d73fc0fee (patch)
tree9211ac365aa2c1a2d4d69e8ffafdc9deb5741768
parentfab1e55ee7b37fd8eccd4771aefe94bad5648ed3 (diff)
downloadceph-eb8d91feaf440a2d9bd8f54f3b72b61d73fc0fee.tar.gz
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>
-rw-r--r--src/osd/PG.cc5
1 files changed, 0 insertions, 5 deletions
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);