mon: validate states transmitted in beacons #10428
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Actual build error here:
|
|
Oops, updated. |
|
Reviewed-by: |
| @@ -646,6 +646,23 @@ bool MDSMonitor::prepare_beacon(MonOpRequestRef op) | |||
| m->get_name(), fsmap.get_epoch(), state, seq, | |||
| CEPH_FEATURES_SUPPORTED_DEFAULT)); | |||
| } else { | |||
| if (info.state == MDSMap::STATE_STANDBY && state != info.state) { | |||
There was a problem hiding this comment.
These ifs should probably be an else if to be consistent I think?
There was a problem hiding this comment.
Fair point, updated to flatten these conditions into the outer series of else ifs
|
|
Since FSMap was added, the state of a daemon can lead to an entirely invalid map, but we were letting daemons send any state they wanted. Especially, we must not allow standby daemons to set any state other than STANDBY. Fixes: http://tracker.ceph.com/issues/16592 Signed-off-by: John Spray <john.spray@redhat.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Since FSMap was added, the state of a daemon can lead
to an entirely invalid map, but we were letting daemons
send any state they wanted.
Especially, we must not allow standby daemons to set
any state other than STANDBY.
Fixes: http://tracker.ceph.com/issues/16592
Signed-off-by: John Spray john.spray@redhat.com