New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mgr: fix several init/re-init bugs #14328

merged 6 commits into from Apr 6, 2017


None yet
2 participants

liewegas commented Apr 4, 2017

No description provided.

liewegas added some commits Apr 4, 2017

mgr/Mgr: use cond (not context) for FSMap wait
This is simpler.

Signed-off-by: Sage Weil <>
mgr/Mgr: fix map waits in init
If we go active multiple times we may already have an fsmap
subscription registered via MonClient, which means that we
won't receive a net new FSMap during the init phase.  This is
trivial to reproduce; just 'ceph mgr fail x' and when it
activates the second time init() will get stuck waiting.

The core issue is that monc subs are stateful, but we forget
the various maps with the previous Mgr incarnation.  Sipmle
workaround is to reset the mon connection as we init.

Signed-off-by: Sage Weil <>
mgr/Mgr: drop lock while fetching config-keys
This avoids a deadlock if some other message arrives before
the command reply and needs to take the mgr lock in dispatch.

Signed-off-by: Sage Weil <>

@liewegas liewegas requested a review from tchaikov Apr 4, 2017

mgr/Mgr: log something at end of handle_mgr_digest
Saw a run that showed the notify_all pg_summary as the last
message for this thread; hopefully we can see if it is
blocked in notify_all() or not.

Signed-off-by: Sage Weil <>

This comment has been minimized.


liewegas commented Apr 5, 2017

mon/MgrMonitor: make debug prefix useful
Signed-off-by: Sage Weil <>

This comment has been minimized.


liewegas commented Apr 5, 2017

retest this please

@liewegas liewegas merged commit 1d465fa into ceph:master Apr 6, 2017

3 checks passed

Signed-off-by all commits in this PR are signed
Unmodifed Submodules submodules for project are unmodified
default Build finished.

@liewegas liewegas deleted the liewegas:wip-mgrmap-features branch Apr 6, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment