container/podman: fix zfsFilesystem and zfsParent being swapped.
#3765
Conversation
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
`DetermineDeviceStorage` was introduced in 1fb7f23 and returns `rootfsStorageDir, zfsFilesystem, zfsParent`. But the PodMan implementation added in fea8256 assigns them to `rootfsStorageDir, zfsParent, zfsFilesystem`, so the `zfsParent` and `zfsFilesystem` being reversed. I'm not sure how to best verify this, but from the looks of it, that's a bug, so updating the code to assign the right values. Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 task
Contributor
Author
|
@haircommander @dgrisonnet ptal 🤗 |
Contributor
|
whoop, good catch |
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.
DetermineDeviceStoragewas introduced in 1fb7f23 and returnsrootfsStorageDir, zfsFilesystem, zfsParent.But the PodMan implementation added in fea8256 assigns them to
rootfsStorageDir, zfsParent, zfsFilesystem, so thezfsParentandzfsFilesystembeing reversed.I'm not sure how to best verify this, but from the looks of it, that's a bug, so updating the code to assign the right values.
cadvisor/container/podman/handler.go
Lines 203 to 204 in fd4eb37
cadvisor/container/docker/handler.go
Lines 276 to 277 in fd4eb37