git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit

]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit

author	John Spray <john.spray@redhat.com>
	Thu, 7 Sep 2017 13:44:36 +0000 (09:44 -0400)
committer	John Spray <john.spray@redhat.com>
	Fri, 8 Sep 2017 13:45:41 +0000 (15:45 +0200)
commit	29c6f9adf178f6611a625740f395e397cad9147b
tree	071b42ae65c1bea23ae3995b17a567901a3686cc	tree \| snapshot
parent	28cb4bb2e68298a8a307eb2de6121b60db43cb86	commit \| 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>

src/mon/MgrMonitor.cc		diff \| blob \| history
src/mon/MgrMonitor.h		diff \| blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom