Skip to content
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

librados: block MgrClient::start_command until mgrmap #21832

Merged
merged 4 commits into from May 6, 2018

Conversation

Projects
None yet
2 participants
@tchaikov
Copy link
Contributor

commented May 5, 2018

John Spray and others added some commits Apr 30, 2018

mgr/MgrClient: add mgr_optional mode
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)
librados: config mgrclient for pre-luminous cluster
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit 8fd500d)
librados: fix locking on get_required_monitor_features
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)
librados: timeout on mgr_command()
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)

@tchaikov tchaikov requested review from liewegas, jcsp and jdurgin May 5, 2018

@tchaikov

This comment has been minimized.

Copy link
Contributor Author

commented May 5, 2018

forward-port of #21811

@jdurgin

jdurgin approved these changes May 6, 2018

@tchaikov tchaikov merged commit 87c000b into ceph:mimic May 6, 2018

4 checks passed

Docs: build check OK - docs built
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

@tchaikov tchaikov deleted the tchaikov:mimic-23627 branch May 6, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.