]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
mon/OSDMonitor: do not populate void pg_temp into nextmap 25780/head
authorxie xingguo <xie.xingguo@zte.com.cn>
Fri, 4 Jan 2019 00:39:01 +0000 (08:39 +0800)
committerxie xingguo <xie.xingguo@zte.com.cn>
Fri, 4 Jan 2019 00:39:01 +0000 (08:39 +0800)
commitb1d3ca5e78eaee509c923f06e9024c23cc6ce31a
tree609d2f5d5e6487363e237a040fb8f77c07c8db2b
parente0d538d3f5ecf78269b79ff9a4e6fd9d14fea971
mon/OSDMonitor: do not populate void pg_temp into nextmap

Due to commit ea723fb, pg_temp with clean acting set are added to inc map.
The original intent was to clear out pg_temps during priming, but as
written it would set a new_pg_temp item clearing the pg_temp even if one
didn't already exist.  Adding the up != acting condition in there makes us
only take that path if there is an existing pg_temp entry to remove.

Fixes: https://tracker.ceph.com/issues/37784
Signed-off-by: Aleksei Zakharov <zakharov.a.g@yandex.ru>
src/mon/OSDMonitor.cc