ceph_objectstore_tool.py: Don't use btrfs on FreeBSD #10507
Merged
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
| @@ -1909,6 +1909,7 @@ def remove_btrfs_subvolumes(path): | |||
| status = main(sys.argv[1:]) | |||
| finally: | |||
| kill_daemons() | |||
| remove_btrfs_subvolumes(CEPH_DIR) | |||
| if platform.system() != "FreeBSD": | |||
There was a problem hiding this comment.
nit, could you move this check into remove_btrfs_subvolumes()?
wjwithagen
force-pushed
the
wip-wjw-tests-ceph_objectstore_tool
branch
2 times, most recently
from
605356e
to
71d4a1c
Compare
|
@tchaikov |
|
lgtm @dzafman what do you think? |
| @@ -1889,6 +1889,8 @@ def main(argv): | |||
|
|
|||
|
|
|||
| def remove_btrfs_subvolumes(path): | |||
| if platform.system() != "FreeBSD": | |||
There was a problem hiding this comment.
This shouldn't be: if platform.system() == "FreeBSD": ?
|
@tchaikov I don't understand this change. This looks like the purpose of the remove_btrfs_subvolumes() is exclusively for FreeBSD. See my comment on the code. |
|
@dzafman sorry, i should have checked this change more closely. yes, it should be if platform.system() == "FreeBSD"@wjwithagen could you fix this? |
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
wjwithagen
force-pushed
the
wip-wjw-tests-ceph_objectstore_tool
branch
from
71d4a1c
to
bc03507
Compare
|
please retest this |
|
@tchaikov |
|
retest this please. |
|
test this please |
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.
No description provided.