]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
mon/OSDMonitor: filter the added creating_pgs added from pgmap
authorKefu Chai <kchai@redhat.com>
Fri, 2 Jun 2017 04:43:07 +0000 (12:43 +0800)
committerSage Weil <sage@redhat.com>
Fri, 2 Jun 2017 17:06:50 +0000 (13:06 -0400)
commitbefe07f197624f9740e1452d85e2eb2a31e95c5e
treeb87ef2cb5d091c988961fc4672b6f307f863adcc
parent5281a0ca96cd4ea23864fa0743c0224ea42076e4
mon/OSDMonitor: filter the added creating_pgs added from pgmap

the creating_pgs added from pgmap might contains pgs whose containing
pools have been deleted. this is fine with the PGMonitor, as it has the
updated pg mapping which is consistent with itself. but it does not work
with OSDMonitor's creating_pgs, whose pg mapping is calculated by
itself. so we need to filter the pgmap's creating_pgs when adding them to
OSDMonitor's creating_pgs with the latest osdmap.get_pools().

Fixes: http://tracker.ceph.com/issues/20067
Signed-off-by: Kefu Chai <kchai@redhat.com>
src/mon/OSDMonitor.cc
src/mon/PGMonitor.cc
src/mon/PGStatService.h