]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
OSD: handle the case where we resurrected an old, deleted pg 4556/head
authorSamuel Just <sjust@redhat.com>
Tue, 21 Apr 2015 06:45:57 +0000 (23:45 -0700)
committerxinxin shu <xinxin.shu@intel.com>
Tue, 12 May 2015 17:07:22 +0000 (01:07 +0800)
commit019b28b6397dbc3111faa6a8eb57349a48f408d8
treef4cf1abf415d8d4f5e1a7450eb67e1f7c7b01ae9
parentaef0272d72afaef849b5d4acbf55626033369ee8
OSD: handle the case where we resurrected an old, deleted pg

Prior to giant, we would skip pgs in load_pgs which were not present in
the current osdmap.  Those pgs would eventually refer to very old
osdmaps, which we no longer have causing the assertion failure in 11429
once the osd is finally upgraded to a version which does not skip the
pgs.  Instead, if we do not have the map for the pg epoch, complain to
the osd log and skip the pg.

Fixes: 11429
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit fbfd50de5b9b40d71d2e768418a8eca28b1afaca)

Conflicts:
src/osd/OSD.cc
        resolved by add a new comment line
src/osd/OSD.cc