Merged
Conversation
- && should have been || - change this to instead not send when monmap epoch==0, and only set last_sent_beacon if we actually send. That way we'll send on the next tick after we get a real monmap. Signed-off-by: Sage Weil <sage@redhat.com>
Otherwise the mon will just ignore it and we'll wait another cycle. Signed-off-by: Sage Weil <sage@redhat.com>
gregsfortytwo
approved these changes
Mar 31, 2017
Member
gregsfortytwo
left a comment
There was a problem hiding this comment.
Reviewed-by: Greg Farnum gfarnum@redhat.com
Member
|
Is there an ||-to-&& change somewhere here I'm not seeing? |
Member
|
"change this to instead not send when monmap epoch==0" |
Member
Author
|
A minimal fix would be to change || to && (that is presumably what was intended), but this is better.
|
tchaikov
approved these changes
Apr 1, 2017
| // send beacon to mon even if we are just connected, and the monmap is not | ||
| // initialized yet by then. | ||
| if (monmap.epoch == 0 && | ||
| if (monmap.epoch > 0 && |
Contributor
There was a problem hiding this comment.
right, || is what was intended. maybe we can remove the comment above, which will be confusing then.
This was referenced Apr 1, 2017
Contributor
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
No description provided.