mimic: ceph-volume: check if we run in an selinux environment #32866
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
added 2 commits
January 25, 2020 22:50
Popen does not open a shell by default, so A FileNotFoundError is raised instead of returning a 127 return code. Signed-off-by: Jan Fajerski <jfajerski@suse.com> (cherry picked from commit af30c7f)
Expect selinux related binaries to not be present. Fixes: 33c8a64 Fixes: https://tracker.ceph.com/issues/42957 Signed-off-by: Jan Fajerski <jfajerski@suse.com> (cherry picked from commit 72b79f7)
badone
requested changes
Feb 7, 2020
| try: | ||
| stdout, stderr, code = process.call(['selinuxenabled'], | ||
| verbose_on_failure=False) | ||
| except FileNotFoundError: |
There was a problem hiding this comment.
$ head -1 /usr/sbin/ceph-volume
#!/usr/bin/python2.7
FileNotFoundError is not defined in python2 and the actual exception is 'OSError'. In my testing on Xenial I was able to get it to work by adding the following block before your 'try' block.
try:
FileNotFoundError
except NameError:
FileNotFoundError = OSError
There was a problem hiding this comment.
This issue is actually described in #31809 but oddly nothing was done about it.
There was a problem hiding this comment.
@badone There is a separate issue for this https://tracker.ceph.com/issues/42967. Here is the backport of it #32867
There was a problem hiding this comment.
@jan--f ack, thanks, that explains it.
|
jenkins test ceph-volume tox |
|
test failure is fixed in #33124 |
jan--f
approved these changes
Feb 7, 2020
badone
approved these changes
Feb 9, 2020
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.
backport tracker: https://tracker.ceph.com/issues/42966
backport of #31809
parent tracker: https://tracker.ceph.com/issues/42957
this backport was staged using ceph-backport.sh version 15.0.0.6950
find the latest version at https://github.com/ceph/ceph/blob/master/src/script/ceph-backport.sh