librados: block MgrClient::start_command until mgrmap #21832
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
This is for use when talking to pre-luminous clusters, where we should not block waiting for MgrMap because it might never come. Fixes: https://tracker.ceph.com/issues/23627 Signed-off-by: John Spray <john.spray@redhat.com> (cherry picked from commit bae4718)
Signed-off-by: John Spray <john.spray@redhat.com> (cherry picked from commit 8fd500d)
This wasn't taking the MonClient lock: should use with_monmap to protect access to MonClient::monmap. Signed-off-by: John Spray <john.spray@redhat.com> (cherry picked from commit ef517d0)
because the mgrclient will be waiting for the mgrmap if the mgrmap is not available, when the client is about to send a mgr command. and monitor will drop the subscription requests if the client does not have enough cap for reading mon, so unlike mon commands, the client won't get an EACCES return code in this case. in this change, a timeout machinary is introduced. and the client will wait for "rados-mon-op-timeout" before it gives up. if this setting is 0, it will wait forever. Fixes: https://tracker.ceph.com/issues/23627 Signed-off-by: Kefu Chai <kchai@redhat.com> (cherry picked from commit eaa1179)
|
forward-port of #21811 |
jdurgin
approved these changes
May 6, 2018
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.
Fixes: https://tracker.ceph.com/issues/23627