[release/1.3 backport] Fix flaky btrfs test#3928
Merged
estesp merged 1 commit intocontainerd:release/1.3from Jan 5, 2020
Merged
[release/1.3 backport] Fix flaky btrfs test#3928estesp merged 1 commit intocontainerd:release/1.3from
estesp merged 1 commit intocontainerd:release/1.3from
Conversation
Add logging and move the creation of the snapshotter inside the attempt loop to catch cases where the mountinfo may not be updated yet. When all attempts are reached there is no reason to create the snapshotter as the unmount has already occurred. Signed-off-by: Derek McGowan <[email protected]> (cherry pick from commit 7720325) Signed-off-by: Shengjing Zhu <[email protected]>
|
Build succeeded.
|
Codecov Report
@@ Coverage Diff @@
## release/1.3 #3928 +/- ##
============================================
Coverage 42.07% 42.07%
============================================
Files 129 129
Lines 14322 14322
============================================
Hits 6026 6026
Misses 7395 7395
Partials 901 901
Continue to review full report at Codecov.
|
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
5 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.
backport #3720
Actually I didn't meet the origin problem. But I failed to build btrfs_test.go on i386.
Because using
unix.BTRFS_SUPER_MAGICwithout type cast, causesbtrfs_test.go:79:17: constant 2435016766 overflows int32.I checked master, the use of
unix.BTRFS_SUPER_MAGICwas removed in #3720. So I think backporting is better than fixing the overflow.