[release 1.3] Fix cleanup error on content client test#3855
Merged
estesp merged 1 commit intocontainerd:release/1.3from Nov 27, 2019
Merged
[release 1.3] Fix cleanup error on content client test#3855estesp merged 1 commit intocontainerd:release/1.3from
estesp merged 1 commit intocontainerd:release/1.3from
Conversation
A race occurs today where the cleanup runs after the lease has been deleted, making all the content and statuses eligible for collection during the cleanup. There is a case where a status could be listed but removed before the abort is called. In this case, abort will return a not found and the test cleanup should ignore it. Signed-off-by: Derek McGowan <derek@mcgstyle.net> (cherry picked from commit 8da4346) Signed-off-by: Wei Fu <fuweid89@gmail.com>
thaJeztah
approved these changes
Nov 27, 2019
Member
thaJeztah
left a comment
There was a problem hiding this comment.
LGTM
do we need this in the 1.2 branch as well?
|
Build succeeded.
|
Member
Author
@thaJeztah already file pr #3856 |
Codecov Report
@@ Coverage Diff @@
## release/1.3 #3855 +/- ##
============================================
Coverage 45.59% 45.59%
============================================
Files 116 116
Lines 11465 11465
============================================
Hits 5227 5227
Misses 5338 5338
Partials 900 900
Continue to review full report at Codecov.
|
jterry75
added a commit
to jterry75/containerd
that referenced
this pull request
Dec 3, 2019
containerd 1.3.2 Welcome to the v1.3.2 release of containerd! The second patch release for `containerd` 1.3 includes a fix for a race condition related to the reported pid on exit when called from Docker. ### Runtime * Fix containerd pid race condition [containerd#3857](containerd#3857) * Use cached process state to reduce exec cost [containerd#3711](containerd#3711) ### CRI * Added `insecure_skip_verify` option in the registry tls config to allow skipping registry certificate verification [containerd#3847](containerd#3847) Please try out the release binaries and report any issues at https://github.com/containerd/containerd/issues. ### Contributors * Lantao Liu * Derek McGowan * Michael Crosby * Phil Estes * Maksym Pavlenko ### Changes * [`ff48f57fc8`](containerd@ff48f57) Merge pull request [containerd#3866](containerd#3866) from dmcgowan/prepare-1.3.2 * [`99005c2647`](containerd@99005c2) Add release notes for v1.3.2 * [`e987ea3cac`](containerd@e987ea3) Merge pull request [containerd#3864](containerd#3864) from Random-Liu/update-cri-release-1.3 * [`8bbd71e560`](containerd@8bbd71e) Update cri to b1bef15fbeb6c6f0569b67322acfa74ca3597755. * [`070c27205c`](containerd@070c272) Merge pull request [containerd#3863](containerd#3863) from Random-Liu/cherrypick-#3857-release-1.3 * [`306d6d4b55`](containerd@306d6d4) Fix container pid. * [`5028701f1a`](containerd@5028701) Merge pull request [containerd#3753](containerd#3753) from thaJeztah/1.3_backport_avoid_unnecessary_runc_state * [`e3d2b608cc`](containerd@e3d2b60) Merge pull request [containerd#3855](containerd#3855) from fuweid/cp-3853 * [`04fbb97ad0`](containerd@04fbb97) Fix cleanup error on content client test * [`be24f39454`](containerd@be24f39) Merge pull request [containerd#3840](containerd#3840) from ameyag/1.3_backport_log_file_win * [`333679343b`](containerd@3336793) Add `--log-file` flag for windows service. * [`9abfc70043`](containerd@9abfc70) Use cached state instead of `runc state`. ### Changes from containerd/cri * [`b1bef15f`](containerd/cri@b1bef15) Merge pull request [containerd#1346](containerd/cri#1346) from Random-Liu/cherrypick-#1345-release-1.3 * [`27edfa06`](containerd/cri@27edfa0) Add insecure_skip_verify option. * [`e5dd8053`](containerd/cri@e5dd805) Merge pull request [containerd#1322](containerd/cri#1322) from Random-Liu/cherrypick-#1319-release-1.3 * [`c0dee957`](containerd/cri@c0dee95) Fix containerd build, use `libbtrfs-dev` when available. * [`1fb415d2`](containerd/cri@1fb415d) Merge pull request [containerd#1314](containerd/cri#1314) from Random-Liu/cherrypick-#1312-release-1.3 * [`0973459d`](containerd/cri@0973459) Update based on default xenial distro. * [`a46f6baf`](containerd/cri@a46f6ba) Configure golangci-lint ### Dependency Changes Previous release can be found at [v1.3.1](https://github.com/containerd/containerd/releases/tag/v1.3.1) * **github.com/containerd/cri** 5d49e7e51b43e36a6b9c4386257c7d08c602237f -> b1bef15fbeb6c6f0569b67322acfa74ca3597755 # gpg: directory '/c/Users/juterry/.gnupg' created # gpg: keybox '/c/Users/juterry/.gnupg/pubring.kbx' created # gpg: Signature made Tue Dec 3 11:09:10 2019 PST # gpg: using RSA key 8C7A111C21105794B0E8A27BF58C5D0A4405ACDB # gpg: Can't check signature: No public key
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.
A race occurs today where the cleanup runs after the lease
has been deleted, making all the content and statuses
eligible for collection during the cleanup. There is a case
where a status could be listed but removed before the
abort is called. In this case, abort will return a not found
and the test cleanup should ignore it.
Signed-off-by: Derek McGowan derek@mcgstyle.net
(cherry picked from commit 8da4346)
Signed-off-by: Wei Fu fuweid89@gmail.com
cherry-pick #3853