From: Samuel Just <samuel.just@dreamhost.com>
Date: Wed, 2 Nov 2011 18:50:29 +0000 (-0700)
Subject: PG: mark scrubmap entry as not absent when we see an update
X-Git-Tag: v0.38~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2f97a2223f67596b236f5efa85f03f9f34ec0f50;p=ceph.git

PG: mark scrubmap entry as not absent when we see an update

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>
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index d6ede4cc6028..08bd783d2f18 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -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;
     }