]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/PG: do not assume delete event means found_missing
authorSage Weil <sage@redhat.com>
Tue, 26 Jun 2018 02:08:48 +0000 (21:08 -0500)
committerNathan Cutler <ncutler@suse.com>
Wed, 4 Jul 2018 23:03:34 +0000 (01:03 +0200)
This condition was introduced in 3a9d056d843bcafd26d78950b84e2844f8a3a9a1
as part of the missing deletes series, without a clear motivation.  The
best guess is that it was either compensating for some other unfound bug
or simply being a bit overaggressive.

The problem is that it triggers a notify being sent to the sender, or
restarts recovery, both of which are overreactions.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 81d918d449f0211c8eac262e700930473f6e98a3)

src/osd/PG.cc

index f8fdc05e483ef7c81760a60252416c79c0eb8982..43c0ec28865b0a6e4d8fb5dfe471b57999a9be61 100644 (file)
@@ -665,7 +665,6 @@ bool PG::MissingLoc::add_source_info(
     if (p->second.is_delete()) {
       ldout(pg->cct, 10) << __func__ << " " << soid
                         << " delete, ignoring source" << dendl;
-      found_missing = true;
       continue;
     }
     if (oinfo.last_update < need) {