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

luminous: mon/MgrMonitor: handle cmd descs to/from disk in the absence of active mgr #18038

Merged
merged 2 commits into from Oct 1, 2017

Conversation

Projects
None yet
3 participants
@jecluis
Member

jecluis commented Sep 29, 2017

backport tracker: http://tracker.ceph.com/issues/22079

This PR contains two commits, one of which is targeting specifically luminous (and we have no way around it), and the other is a cherry-pick from master.

Signed-off-by: Joao Eduardo Luis <joao@suse.de>

jecluis added some commits Sep 27, 2017

mon/MgrMonitor: populate on-disk cmd descs if empty on upgrade
During kraken, when we first introduced the mgrs, we wouldn't populate
the on-disk command descriptions on create_initial(). Therefore, if we
are upgrading from a cluster that never had a mgr, we may end up
crashing because we have no cmd descs to load from disk.

Fixes: http://tracker.ceph.com/issues/21300

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
mon/MgrMonitor: read cmd descs if empty on update_from_paxos()
If the MgrMonitor's `command_descs` is empty, the monitor will not send
the mgr commands to clients on `get_descriptions`. This, in turn, has
the clients sending the commands to the monitors, which will have no
idea how to handle them.

Therefore, make sure to read the `command_descs` from disk if the vector
is empty.

Fixes: http://tracker.ceph.com/issues/21300

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
(cherry picked from commit 3d06079)

@jecluis jecluis added this to the luminous milestone Sep 29, 2017

@jecluis jecluis requested review from liewegas and theanalyst Sep 29, 2017

@liewegas liewegas changed the title from mon/MgrMonitor: handle cmd descs to/from disk in the absence of active mgr to luminous: mon/MgrMonitor: handle cmd descs to/from disk in the absence of active mgr Sep 29, 2017

@liewegas liewegas merged commit 242635d into ceph:luminous Oct 1, 2017

3 of 4 checks passed

Docs: build check Docs: failed with errors
Details
Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
make check make check succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment