cephadm: Infer config on "cephadm shell"#34728
Merged
sebastian-philipp merged 1 commit intoceph:masterfrom May 4, 2020
Merged
Conversation
sebastian-philipp
suggested changes
Apr 24, 2020
Comment on lines
+1096
to
+1098
| if daemon['name'].startswith('mon.'): | ||
| name = daemon['name'] | ||
| break |
Contributor
There was a problem hiding this comment.
we really need proper data types and classes here in cephadm.
sebastian-philipp
approved these changes
Apr 24, 2020
37bbd18 to
765eff1
Compare
765eff1 to
36210ba
Compare
jschmid1
reviewed
Apr 24, 2020
src/cephadm/cephadm
Outdated
| if args.config: | ||
| logger.debug('Using specified config: %s' % args.config) | ||
| return func() | ||
| if not args.config and os.path.exists(SHELL_DEFAULT_CONF): |
Contributor
There was a problem hiding this comment.
maybe infer the config even if SHELL_DEFAULT_CONF exists?
Contributor
Author
There was a problem hiding this comment.
@jschmid1 I've changed it, so the new precedence order is:
--configoption- config inferred from
MON - default
/etc/ceph/ceph.conflocation
36210ba to
71d9054
Compare
Contributor
|
jenkins test docs |
tchaikov
reviewed
Apr 27, 2020
This was referenced Apr 27, 2020
71d9054 to
249c324
Compare
Fixes: https://tracker.ceph.com/issues/44792 Signed-off-by: Ricardo Marques <rimarques@suse.com>
249c324 to
eb732dc
Compare
Contributor
Author
|
@sebastian-philipp FYI, I've now updated the documentation in this PR to reflect the |
Contributor
ricardoasmarques
referenced
this pull request
in smithfarm/ceph-salt
Jun 2, 2020
The "ceph orch status" command is known to hang if /etc/ceph/ceph.conf on the host points to hosts that used to be MONs but are not anymore. It's debatable what an appropriate timeout is (30 seconds, more, less?) but commands that are known to hang should have an explicit timeout. References: ceph#199 Signed-off-by: Nathan Cutler <ncutler@suse.com>
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.
This PR simplifies the usage of
cephadm shellon MON nodes by inferring the config:The main motivation of this PR, is that the
/etc/ceph/ceph.confgenerated by thebootstrapcommand will became outdated when new MONs are added.Fixes: https://tracker.ceph.com/issues/44792
Signed-off-by: Ricardo Marques rimarques@suse.com
Checklist
Show available Jenkins commands
jenkins retest this pleasejenkins test classic perfjenkins test crimson perfjenkins test signedjenkins test make checkjenkins test make check arm64jenkins test submodulesjenkins test dashboardjenkins test dashboard backendjenkins test docsjenkins render docsjenkins test ceph-volume alljenkins test ceph-volume tox