]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
mon/OSDMonitor: do not populate void pg_temp into nextmap 25845/head
authorxie xingguo <xie.xingguo@zte.com.cn>
Fri, 4 Jan 2019 00:39:01 +0000 (08:39 +0800)
committerPrashant D <pdhange@redhat.com>
Tue, 8 Jan 2019 23:15:10 +0000 (18:15 -0500)
commit2894677246b9fccf744b4f93ecc6591f7dae784a
treef45719322013361d23f5b6d60ea76bc8f9aa4292
parent9b49daf0c4b188d193e49abd9bc5bbe657d7a8f8
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>
(cherry picked from commit b1d3ca5e78eaee509c923f06e9024c23cc6ce31a)
src/mon/OSDMonitor.cc