mgr/cephadm: fix env_var passing to cephadm#34944
Merged
sebastian-philipp merged 5 commits intoceph:masterfrom May 14, 2020
Merged
mgr/cephadm: fix env_var passing to cephadm#34944sebastian-philipp merged 5 commits intoceph:masterfrom
sebastian-philipp merged 5 commits intoceph:masterfrom
Conversation
mgfritch
reviewed
May 7, 2020
Contributor
|
needs rebase |
0fefb73 to
3204209
Compare
mgfritch
approved these changes
May 8, 2020
Contributor
mgfritch
left a comment
There was a problem hiding this comment.
couple minor nits, but overall looks good 👍
Comment on lines
+1273
to
+955
| if env_vars: | ||
| for env_var_pair in env_vars: | ||
| final_args.extend(['--env', env_var_pair]) |
Contributor
There was a problem hiding this comment.
Suggested change
| if env_vars: | |
| for env_var_pair in env_vars: | |
| final_args.extend(['--env', env_var_pair]) | |
| if env_vars: | |
| for k,v in env_vars.items(): | |
| final_args.extend(['--env', f'{k}={v}']) |
Maybe it would be better to use a dict type instead of list?
Contributor
Author
There was a problem hiding this comment.
I deliberately chose [K=V] as this is the format that will be passed along to bin/cephadm. While I do agree that a dict type is the correct type for this case, but in this case I'd favor practicability.
3204209 to
ce8ccff
Compare
added 5 commits
May 12, 2020 12:07
Signed-off-by: Joshua Schmid <jschmid@suse.de>
Signed-off-by: Joshua Schmid <jschmid@suse.de>
Signed-off-by: Joshua Schmid <jschmid@suse.de>
Signed-off-by: Joshua Schmid <jschmid@suse.de>
Signed-off-by: Joshua Schmid <jschmid@suse.de>
aaf463e to
8f27583
Compare
sebastian-philipp
approved these changes
May 12, 2020
Comment on lines
+33
to
+34
| # env_vars = [f"CEPH_VOLUME_OSDSPEC_AFFINITY={drive_group.service_id}"] | ||
| # disable this until https://github.com/ceph/ceph/pull/34835 is merged |
Contributor
There was a problem hiding this comment.
Instead of reverting this, can we make this somehow optional?
Contributor
Author
There was a problem hiding this comment.
I thought about this as well, but I'm not sure how. The workability depends on the ceph-osd version (no specific version can be determined though)
Contributor
Author
|
the make check error looks pretty much unrelated: |
Contributor
|
jenkins test make check |
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
3 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.
Signed-off-by: Joshua Schmid jschmid@suse.de
This needs to be merged together with: #34835
Fixes: https://tracker.ceph.com/issues/45394
Revert commit 8f27583 when #34835 is merged
bin/cephadm shell's --env flag to the global parserShow 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