cephadm: remove injected_args#39619
Merged
sebastian-philipp merged 5 commits intoceph:masterfrom Mar 10, 2021
Merged
Conversation
Contributor
Author
|
replaces #37495 |
Member
|
jenkins test make check |
This was referenced Feb 22, 2021
25bf6a8 to
f7c829e
Compare
Comment on lines
+6580
to
+6727
| path = os.path.realpath(__file__) | ||
| assert os.path.isfile(path) | ||
| return path |
Contributor
Author
|
f7c829e to
40b2962
Compare
Contributor
Author
|
changelog: fix cephadm tox |
jmolmo
reviewed
Mar 3, 2021
| ['mkdir', '-p', f'/var/lib/ceph/{self.mgr._cluster_fsid}']) | ||
| if code: | ||
| msg = f"Unable to deploy the cephadm binary to {host}: {_err}" | ||
| self.log.warning(msg) |
Member
There was a problem hiding this comment.
maybe this kind of situations and the consequences deserves an "error" instead of a "warning"
mgfritch
approved these changes
Mar 3, 2021
Contributor
mgfritch
left a comment
There was a problem hiding this comment.
lgtm! .. mostly nits around readability of the remoto connection handling, but the code is correct
Comment on lines
+996
to
+1004
| out, err, code = remoto.process.check( | ||
| conn, | ||
| [python, self.mgr.cephadm_binary_path] + final_args, | ||
| stdin=stdin.encode('utf-8') if stdin is not None else None) |
Contributor
There was a problem hiding this comment.
(nit) the remoto.process logic and the logic above are duplicates .. move into a helper func?
| if code == 2: | ||
| out_ls, err_ls, code_ls = remoto.process.check( | ||
| conn, ['ls', self.mgr.cephadm_binary_path]) | ||
| if code_ls == 2: |
Contributor
There was a problem hiding this comment.
Suggested change
| if code_ls == 2: | |
| if code_ls != 0: |
(nit) similar, but maybe any non-zero errcode?
Might also be good to extract this into a dedicated cephadm_binary_exists function?
| stdin=script.encode('utf-8')) | ||
| [python, self.mgr.cephadm_binary_path] + final_args, | ||
| stdin=stdin.encode('utf-8') if stdin is not None else None) | ||
| if code == 2: |
Contributor
There was a problem hiding this comment.
Suggested change
| if code == 2: | |
| if code == errno.ENOENT: |
(nit) I was somewhat confused why retval 2, but it's file not found from python.
|
This pull request can no longer be automatically merged: a rebase is needed and changes have to be manually resolved |
right now, an upgrade might overwrite the existing binary which would force us to have the CLI stable. Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
Removed the injected_argv parameter and the injection of code in the cephadm script we send to hosts. Now the script is copied and after that we execute the cephadm command. I would like to copy it only one time (when adding new hosts) but this will be part of a future PR, together with other prs to: - Introduce cephadm version - Get rid of packaged/root mode - Use pex or eggs Signed-off-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com> Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
Avoid copying cephadm all the time. Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
Because we now always have a script on the remote hosts. Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
40b2962 to
c40436e
Compare
Contributor
Author
Contributor
Author
|
jenkins test make check |
14 tasks
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 is based on #39141 and will contain those commits, unit it is merged
Avoid copying cephadm all the time.
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 apijenkins test docsjenkins render docsjenkins test ceph-volume alljenkins test ceph-volume tox