Fix image usage calculation error#4275
Merged
dmcgowan merged 1 commit intocontainerd:masterfrom May 20, 2020
Merged
Conversation
Including snapshotter usage in total calculation should be gated by the option `snapshotter` boolean. Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
|
Build succeeded.
|
fuweid
approved these changes
May 20, 2020
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.
Including snapshotter usage in total calculation should be gated by the
option
snapshotterboolean.Sometimes a flaky test is trying to tell you something 😄 The intermittent failures of
TestImageUsagewere actually always reporting the same "offset"; turns out that offset was the exact size of the unpacked root fs of the busybox amd64 build. What was happening is since busybox is used throughout other tests, a snapshot was created that was sometimes not garbage collected by the timeTestImageUsageran, and therefore since the label was associated with the amd64 manifest, it would be added to the size calculation and cause this test to fail.// cc: @fuweid since I know you had tried to fix this at one point; I also added a deferred deletion of the image reference pinned to the sha256 in the test as when you run it locally multiple times you still get wrong results unless both images are removed. A possibly more "stable" result would be to use a totally different image name that isn't used by any other tests.
Signed-off-by: Phil Estes estesp@linux.vnet.ibm.com