]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
mon/OSDMonitor: do not populate void pg_temp into nextmap 25844/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:14:21 +0000 (18:14 -0500)
commitc1fb78ebdbf38f4e597a2c2c27bfe5bd928dfabb
tree64ae22746ba9bbe42d918483098ae9ee9d4a5f34
parent4be4c4bd8c2140070976422c7366457b60fc3e2b
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