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: Misc. bug fixes #14883

merged 8 commits into from May 1, 2017


None yet
1 participant

tchaikov commented Apr 30, 2017

These came from working on #13725, separating them out into a separate PR.

// this PR is actually #14578, but rebased against master so we can merge it sonner.

John Spray added some commits Mar 5, 2017

common/finisher: use distinct lock names
Two Finishers should not be considered equivalent
for lockdep purposes: for example in mgr we have
our in-mgr Finisher, and then any finishers that
might be in libraries called by modules.

Signed-off-by: John Spray <>
mon: don't enqueue periodic digest if one is already waiting
This was causing mons to send far more digest messages than
should have been sent.  Could have been responsible for
reports of very high CPU consumption on the mgr daemon.

Signed-off-by: John Spray <>
mgr: improve handle_command
Run the python module calls in a finisher so that
they don't block the daemonserver lock and so that
they can call back into mgr stuff if they need to.

Fix passing through commands to python modules, this
was giving EINVAL because only things with a MgrCommand
were getting let in.

Also fix get_command_descriptions, which was not
including the output of the formatter in the response.

Signed-off-by: John Spray <>
vstart: fix mgr caps for MDS daemons
Signed-off-by: John Spray <>
mgr: get fresh maps on second load of Mgr
I think we got away with this when Client::init was
re-initialising the MonClient, but now that (bogus)
stuff isn't happening any more as Client doesn't
init/teardown monc/objecter itself.

Signed-off-by: John Spray <>
mgr: fix deadlock in dispatch
Signed-off-by: John Spray <>
mgr: fix message refcounting
Let's be consistent and push the m->put down into
the handle_(M<class>* m) functions the way
we do in the rest of the codebase.

Signed-off-by: John Spray <>
mon: tweak mgr status text
Previously at startup we saw contradictory status
that had a "no active mgr" health message and then
a line that said "active: x".

Mitigate that a bit by indicating that a !available
active daemon is starting up.

Signed-off-by: John Spray <>

@tchaikov tchaikov requested review from liewegas and jcsp Apr 30, 2017

@tchaikov tchaikov referenced this pull request Apr 30, 2017


mgr: Misc. bug fixes #14578


This comment has been minimized.

@tchaikov tchaikov merged commit 61a87c2 into ceph:master May 1, 2017

3 checks passed

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

@tchaikov tchaikov deleted the tchaikov:wip-mgr-misc branch May 1, 2017

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