[1.19] vendor: bump containers/storage to v1.23.8 #4336
Closed
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
Signed-off-by: Urvashi Mohnani <[email protected]>
[1.19] Add logic for running openshift e2e-aws tests
This reverts commit a1bd010. Signed-off-by: Urvashi Mohnani <[email protected]>
[1.19] Revert "Add logic for running openshift e2e-aws tests"
This fixes the build of the release-note tool, which previously failed with: ``` vendor/google.golang.org/api/internal/conn_pool.go:29:2: undefined: grpc.ClientConnInterface ``` Signed-off-by: Sascha Grunert <[email protected]>
Bump GRPC to v1.27.0
otherwise, we leak containers in runc Signed-off-by: Peter Hunt <[email protected]>
[1.19] server: cleanup container in runtime after failed creation
Sometimes this test fails like this:
> not ok 11 config dir should fail with invalid option
> (in test file ./config.bats, line 38)
> `RES=$(cat "$CRIO_LOG")' failed
> cat: /tmp/tmp.nho2aP6lqh/crio.log: No such file or directory
> unable to decode configuration /tmp/tmp.nho2aP6lqh/crio.conf: Near line 2 (last key parsed 'crio.runtime.log_level'): expected value but found "info" instead
The reason it fails is logs are written by using tee,
which for some reason is run in a subshell, and it looks
like a race between the main shell and the subshell.
Anyway, using tee is not needed here. Simplify it by using run,
and add a check for non-zero exit code.
The second proble is, the test is not doing what it supposed to.
Judging by the test name ("config dir should fail"), it seems the test
should write a correct log_level value to the main config file, a wrong
value to a file under crio.conf.d, and check that crio fails.
The problem is, the value in main file is wrong as well it is not quoted.
Fix the test so the main config file has the correct log_level value.
Fix the output check to look for the specific bad key.
Signed-off-by: Kir Kolyshkin <[email protected]>
Signed-off-by: Kir Kolyshkin <[email protected]>
The following failure happens in CI on RHEL7 from time to time: > removing the pod sandbox "0d5bf5eeb0048bb70ab8ee9bca0a497e216a6c6cfa42507a8d735f61c825784d": rpc error: code = Unknown desc = unable to remove managed namespaces: Removing namespaces encountered the following errors [unlinkat /var/run/netns/0376543d-4917-417f-b406-7e8ab07cb847: device or resource busy] (with different test cases and different namespaces). RHEL7 kernel has upstream commit [1] backported, but the feature is controlled by a sysctl and is off by default. For the feature to work, one needs to set fs.may_detach_mounts = 1. On production RHEL7 systems, this is done by runc rpm (see [2]), but we're not using those rpms for CI, so we have to set the sysctl manually. Add an integration test case to check the sysctl is set. [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=8ed936b5671bfb33d89bc60bdcc7cf0470ba52fe [2] https://bugzilla.redhat.com/show_bug.cgi?id=1823374#c17 Signed-off-by: Kir Kolyshkin <[email protected]>
... and make it fatal. See previous commit for details. Signed-off-by: Kir Kolyshkin <[email protected]>
…pick-4217-to-release-1.19 [release-1.19] Fix bogus CI test failures
…pick-4213-to-release-1.19 [release-1.19] test/config: fix "config dir should fail with invalid option"
If Pid or InitPid is not set correctly, then c.Alive() will return false, and all calls depending on c.Alive() will fail. Fixes: cri-o#4224 Signed-off-by: bin liu <[email protected]> (cherry picked from commit 6913515) Fixes: cri-o#4264 Signed-off-by: Francesco Giudici <[email protected]>
…nfra [1.19] runtime_vm: set Pid and InitPid for VM runtimes
Signed-off-by: Fabiano Fidêncio <[email protected]>
Passing ttrpc.ErrClosed to errdefs.FromGRPC() will result in an "ttrpc: closed: unknown" error, which we can't match in any possible way. Knowing that let's, instead, return errdefs.ErrNotFound, as already done in updateContainerStatus() so we can properly match the error when it occurs. Signed-off-by: Fabiano Fidêncio <[email protected]>
In the goroutine used to monitor whether the container was terminated or not, we should not fail in case the VM was shutdown, as this is expected to happen and will cause a ttrpc.ErrClosed. runtime's wait() function, however, will returns errdefs.ErrNotFound when a ttrpc.ErrCloses happens in order to avoid returning "ttrpc: closed: unknown" (see previous commit) and that's the reason we just check for errdefs.ErrNotFound and do not error out in that case. Signed-off-by: Fabiano Fidêncio <[email protected]>
If the VM is down when removing the container, ttrpc.ErrClosed would be returned and we'd return this error up in the chain. However, if the VM is down, so is the container and we could simply ignore the error reported, as already done in a few other parts of our code. Signed-off-by: Fabiano Fidêncio <[email protected]>
…pick-4263-to-release-1.19 [release-1.19] runtime_vm: Fix non terminating pods
This is mostly to have containers/storage#757 which should fix occasional CI failures. Manual backport of commit 85c665a. Signed-off-by: Kir Kolyshkin <[email protected]>
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: kolyshkin The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
Thanks for your pull request. Before we can look at it, you'll need to add a 'DCO signoff' to your commits. 📝 Please follow instructions in the contributing guide to update your commits with the DCO Full details of the Developer Certificate of Origin can be found at developercertificate.org. The list of commits missing DCO signoff:
DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
|
@kolyshkin: PR needs rebase. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
Collaborator
Author
|
Ahh, wrong base branch; fixed in #4337 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
9 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.
What type of PR is this?
/kind bug
What this PR does / why we need it:
(this is a backport of #4334 to 1.19 release branch)
This is mostly to have containers/storage#757
which should fix occasional CI failures (and probably real failures, too).
Which issue(s) this PR fixes:
periodically caught by CI
Special notes for your reviewer:
(this is a backport of #4334 to 1.19 release branch)
Does this PR introduce a user-facing change?