chore: deflake the blockfile testsuite#8696
Merged
kzys merged 5 commits intocontainerd:mainfrom Jun 26, 2023
Merged
Conversation
Signed-off-by: Wei Fu <[email protected]>
Signed-off-by: Wei Fu <[email protected]>
* Use direct-io mode to reduce IO. * Add testViewHook helper to recovery the backing file since the ext4 might need writable permission to handle recovery. If the backing file needs recovery and it's for View snapshot, the readonly mount will cause error. * Use 8 MiB as capacity to reduce the IO. Signed-off-by: Wei Fu <[email protected]>
|
Skipping CI for Draft Pull Request. |
Member
|
@fuweid Approved and merged continuity changes. You don't have to modify |
f51291f to
2aed141
Compare
Pin it with 1e0d26eb2381594984ee80989c9c229dbd930d9f Signed-off-by: Wei Fu <[email protected]>
2aed141 to
59b0b39
Compare
Signed-off-by: Wei Fu <[email protected]>
kzys
approved these changes
Jun 20, 2023
cpuguy83
approved these changes
Jun 26, 2023
kiashok
added a commit
to kiashok/containerd
that referenced
this pull request
Oct 23, 2024
…/main Merge upstream containerd/main at commit 5d1ab01 into ado fork-external/main Related work items: containerd#7944, containerd#8174, containerd#8334, containerd#8362, containerd#8572, containerd#8582, containerd#8588, containerd#8605, containerd#8606, containerd#8617, containerd#8619, containerd#8626, containerd#8627, containerd#8633, containerd#8637, containerd#8641, containerd#8643, containerd#8645, containerd#8652, containerd#8667, containerd#8672, containerd#8673, containerd#8676, containerd#8680, containerd#8684, containerd#8685, containerd#8692, containerd#8696, containerd#8697, containerd#8701, containerd#8708, containerd#8717, containerd#8726, containerd#8728, containerd#8729, containerd#8731, containerd#8732, containerd#8740, containerd#8752, containerd#8758, containerd#8762, containerd#8764
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
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.
mount supports
direct-iooption for loop block device. In the original loop setup, theDirectflag doesn't work even if the syscall returns successfully. In the patch, I useioctlto set the direct-io and return error if the old kernel doesn't support this.It's a cleanup for the snapshot test. The detach umount might cause unexpected issue. It's hard to debug in the github action. The umount without detach might be slow but it's easy to figure out the flaky cases.
The patch is trying to deflake the blockfile snapshot test case. The view-type snapshot mounts the device with readonly. If the filesystem needs to recovery, the kernel will return the EROFS and the error in
dmesgis like.For this case, I introduce a
viewHookhelper for test. It's used to mount the snapshot with write permission, so that the kernel can handle recovery at first. Then the ro mount won't fail.And using
8MiBis to reduce IO pressure. :)vendor: should sync when we applyvendor: update github.com/containerd/continuityEven if we use direct-io for loop, we still have the unsync error, like
So I change the fs/fstest to force sync for new file. Hopefully, containerd/continuity#228 it's acceptable.
I run this branch for test in azure Standard D4s v4. It's happy. :)