]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
PG: mark scrubmap entry as not absent when we see an update
authorSamuel Just <samuel.just@dreamhost.com>
Wed, 2 Nov 2011 18:50:29 +0000 (11:50 -0700)
committerSage Weil <sage@newdream.net>
Thu, 10 Nov 2011 23:05:05 +0000 (15:05 -0800)
Previously, there would be an assert failure in _scan_list if we see an
object deleted and then recreated.

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
src/osd/PG.cc

index d6ede4cc602825f52239e1881dae9e983643a189..08bd783d2f18aeb3ad8f08edd9af8977ce28be9a 100644 (file)
@@ -2773,6 +2773,7 @@ void PG::build_inc_scrub_map(ScrubMap &map, eversion_t v)
   for (; p != log.log.end(); p++) {
     if (p->is_update()) {
       ls.push_back(p->soid);
+      map.objects[p->soid].negative = false;
     } else if (p->is_delete()) {
       map.objects[p->soid].negative = true;
     }