mon: fix commands advertised during mon cluster upgrade #16871
Conversation
|
I'm a bit conflicted here. We didn't have the PGMonitorCommands explicitly broken out before.. it seems like it might be better to advertise and use those until the require luminous bit is set (and then flip over to mgr mode) but that's a slightly bigger change. |
|
http://pulpito.ceph.com/sage-2017-08-07_15:29:52-upgrade:jewel-x-wip-20920-distro-basic-smithi/ looks much better (altho there are still 2 tests going). cls_rgw is unrelated, and the feature bit failure i'm fixing in a separate pr. |
src/mon/Elector.cc
Outdated
| // determine whether we are a dumpling mon due to some crufty old | ||
| // code. It only needs to see this buffer non-empty, so put | ||
| // something useless there. | ||
| m->sharing_bl.append("I am not dumpling"); |
There was a problem hiding this comment.
Is there a point to this? The bandwidth savings hardly seems worth the slight risk of change.
There was a problem hiding this comment.
I originally removed it because the command list is a function of which mon features the quorum has, and we don't know that here. But then I added this back because then jewel thought we were dumpling mons.
There was a problem hiding this comment.
I can go back to hard coding the old command set here for defensive purposes.
There was a problem hiding this comment.
Okay, I'm good with whatever you decide.
src/mon/PGMonitorCommands.h
Outdated
|
|
||
| /* no guard; may be included multiple times */ | ||
|
|
||
| // see MonCommands.h |
There was a problem hiding this comment.
I assume this file was created by copying from somewhere?
The old code was pretty messy. This is standardizes on std::vector throughout. We also drop the win_election command args because when we win an election we always set the leader commands to our commands, and we can do that inside win_command() without passing them in from here. Signed-off-by: Sage Weil <sage@redhat.com>
While we have a mixed version cluster, we have to advertise our PGMonitor commands to our peons or else commands like 'pg dump' won't work. Once the mon feature flag is set, we can drop that because each mon will include the mgr commands (either those stored in paxos or the statically compiled ones until that point). Signed-off-by: Sage Weil <sage@redhat.com>
It's deprecated. Also, this avoids a dup when we have an upgrading mon cluster and it's also in PGMonitorCommands. Signed-off-by: Sage Weil <sage@redhat.com>
This code runs on the mgr. Signed-off-by: Sage Weil <sage@redhat.com>
While we have mixed mons we need to advertise the right set of commands
so that thing in PGmonitor and later mgr will be usable.