]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
projects / ceph.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f5ff82d) | patch
mon: fix dropping mgr metadata for active mgr 17635/head
authorJohn Spray <john.spray@redhat.com>
Thu, 7 Sep 2017 13:44:36 +0000 (09:44 -0400)
committerNathan Cutler <ncutler@suse.com>
Mon, 11 Sep 2017 09:50:13 +0000 (11:50 +0200)
commite7158e8e41e89eb845ecd7a888a5bfc6a008cc75
treec43ce03ac0ac70f230af9f3e9130a81bbf1c7374tree | snapshot
parentf5ff82d8ff4c45aee345b271ef4a3d1b95f83237commit | diff
mon: fix dropping mgr metadata for active mgr

drop_standby() was killing it and it was only getting added
back in certain locations.  Instead, make the metadata
drop conditional and only do it in the places we're
really dropping the daemon, not when we're promoting
it to active.

Fixes: http://tracker.ceph.com/issues/21260
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit 29c6f9adf178f6611a625740f395e397cad9147b)
src/mon/MgrMonitor.cc diff | blob | history
src/mon/MgrMonitor.h diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.