[release/1.3] backport: Transfer error to ErrNotFound when kill a not exist container, also add test case. by joejulian · Pull Request #4361 · containerd/containerd

joejulian · 2020-07-03T22:28:20Z

Backports:

Transfer error to ErrNotFound when kill a not exist container Transfer error to ErrNotFound when kill a not exist container #4214
Fixes Backport: runc container does not exist fix #4359
Minor actions fixes/updates Minor actions fixes/updates #4356
Fixes build issues
test: Do SynchronousDelete cleanup before testing ImageIsUnpacked test: Do SynchronousDelete cleanup before testing ImageIsUnpacked #3832
cleanup the image synchronously for Usage case cleanup the image synchronously for Usage case #4049
Fixes race that causes TestImageUsage to fail
Don't clash with GH Actions runner's containerd Don't clash with GH Actions runner's containerd #4380
Fixes Github Actions

Not-backport:

fixes for backports to 1.3 from 1.4
Fixes up backport changes that didn't fit 1.3

Signed-off-by: Joe Julian [email protected]

theopenlab-ci · 2020-07-03T22:37:12Z

Build succeeded.

containerd-build-arm64 : FAILURE in 3m 02s (non-voting)

theopenlab-ci · 2020-07-03T22:59:49Z

Build succeeded.

containerd-build-arm64 : FAILURE in 2m 16s (non-voting)

theopenlab-ci · 2020-07-03T23:12:14Z

Build succeeded.

containerd-build-arm64 : FAILURE in 1m 34s (non-voting)

theopenlab-ci · 2020-07-03T23:29:24Z

Build succeeded.

containerd-build-arm64 : FAILURE in 1m 52s (non-voting)

theopenlab-ci · 2020-07-07T19:28:38Z

Build succeeded.

containerd-build-arm64 : FAILURE in 1m 34s (non-voting)

theopenlab-ci · 2020-07-07T23:04:27Z

Build succeeded.

containerd-build-arm64 : FAILURE in 1m 36s (non-voting)

theopenlab-ci · 2020-07-08T00:03:07Z

Build succeeded.

containerd-build-arm64 : FAILURE in 1m 39s (non-voting)

theopenlab-ci · 2020-07-08T00:06:49Z

Build succeeded.

containerd-build-arm64 : FAILURE in 1m 36s (non-voting)

theopenlab-ci · 2020-07-08T00:20:57Z

Build succeeded.

containerd-build-arm64 : FAILURE in 1m 41s (non-voting)

theopenlab-ci · 2020-07-08T06:15:49Z

Build succeeded.

containerd-build-arm64 : NODE_FAILURE in 0s (non-voting)

joejulian · 2020-07-08T22:42:51Z

I can't get TestImageUsage to fail when I run that test locally.

joejulian · 2020-07-13T23:29:14Z

Tests always succeed when run locally on my desktop and my laptop. I also had a coworker run the tests and they succeeded.

@cpuguy83 suggested in slack that this might be a flake.

theopenlab-ci · 2020-07-14T16:02:47Z

Build succeeded.

containerd-build-arm64 : FAILURE in 1m 53s (non-voting)

theopenlab-ci · 2020-07-14T16:30:37Z

Build succeeded.

containerd-build-arm64 : FAILURE in 1m 37s (non-voting)

theopenlab-ci · 2020-07-14T16:48:29Z

Build succeeded.

containerd-build-arm64 : FAILURE in 1m 44s (non-voting)

cpuguy83 · 2020-07-14T21:19:25Z

Can you squash your new commits?

theopenlab-ci · 2020-07-15T16:59:04Z

Build succeeded.

containerd-build-arm64 : FAILURE in 2m 26s (non-voting)

thaJeztah · 2020-07-15T17:01:32Z

could someone edit the PR title to use [release/1.3 backport] (for easier finding back which release this was back ported to)?

estesp · 2020-07-15T17:10:36Z

Looks like all PRs are hitting a potential change in the GH actions runners when executing the CRI tests; containerd is now running on the local system on the same socket we are starting on? the version of the "server" seems to be the clue:

Client:
  Version:  42a27e5
  Revision: 42a27e52e8a40c69ea9ef84e35b135a925f0fca3

Server:
  Version:  1.3.5+azure
  Revision: 9b6f3ec0307a825c38617b93ad55162b5bb94234
  UUID: 8ad8caab-77b0-4195-801f-dc84bc0ee5a5

theopenlab-ci · 2020-07-15T17:36:07Z

Build succeeded.

containerd-build-arm64 : FAILURE in 2m 23s (non-voting)

theopenlab-ci · 2020-07-15T22:07:52Z

Build succeeded.

containerd-build-arm64 : FAILURE in 2m 13s (non-voting)

joejulian · 2020-07-15T22:23:12Z

Included the attempted changes in #4382 since these all seem to need to be included as a set.

fuweid · 2020-07-22T03:40:50Z

Change looks good to me. Just see the commit message doesn't contain the cherry-pick field :)

thaJeztah · 2020-07-22T09:23:08Z

Just see the commit message doesn't contain the cherry-pick field :)

Good catch; looks like the first two cherry-picks were done with -x, but the other ones were not

theopenlab-ci · 2020-07-23T00:40:36Z

Build succeeded.

containerd-build-arm64 : FAILURE in 2m 45s (non-voting)

Signed-off-by: payall4u <[email protected]> Add integration test case Signed-off-by: payall4u <[email protected]> (cherry picked from commit b437938) Signed-off-by: Joe Julian <[email protected]> Fixes: containerd#4359

- always apt-get update before installing packages - move to tagged official create_release action The official GH create_release action now has support for body text from file. Signed-off-by: Phil Estes <[email protected]> (cherry picked from commit 57a9f0b) Signed-off-by: Joe Julian <[email protected]>

add test support for v1 move getRuntimeVersion so it is defined on non-linux platforms Remove unused RUNC_FLAVOR The backport from 1.4 included setting RUNC_FLAVOR whis is not used in the 1.3 test matrix. Removing per feedback. Signed-off-by: Joe Julian <[email protected]>

Simply delete the image will not clean up the snapshots. Signed-off-by: Li Yuxuan <[email protected]> (cherry picked from commit 19f7f3c)

TestImageIsUnpacked will unpacked docker.io/library/busybox:latest with linux/amd64 platform. If the TestImageUsage doesn't wait for cleanup finish (snapshotter is cleanup by gc asynchronously) and fetch image, the Usage(ctx) will get 10767844 bytes(manifestUsage + snapshotUsage). However, the manifestUsage is 9466142 bytes. That is why we got the error: ``` Expected actual usage to equal manifest reported usage of 9466142: got 10767844 ``` This commit is to make sure that the image has been cleanup fully. Signed-off-by: Wei Fu <[email protected]> (cherry picked from commit 1d888ad)

GH runners now have a systemd-run containerd running on the standard socket, impacting the CRI test's expectation of our CI-built containerd running there. Signed-off-by: Phil Estes <[email protected]> (cherry picked from commit 7af3d7e)

Signed-off-by: Phil Estes <[email protected]> (cherry picked from commit b47c7ec)

theopenlab-ci · 2020-07-23T04:38:56Z

Build succeeded.

containerd-build-arm64 : FAILURE in 2m 18s (non-voting)

fuweid

LGTM

AkihiroSuda · 2020-07-25T07:58:42Z

+	var opts interface{}
+	runtimeVersion := getRuntimeVersion()
+	switch runtimeVersion {
+	case "v1":


Can we cherry-pick b2ee432 instead

AkihiroSuda · 2020-07-25T07:59:05Z

 	}
 }

+func getRuntimeVersion() string {


This stays on container_linux_test.go on master

joejulian · 2020-07-27T16:32:04Z

That PR reads:

We are going to deprecate shim v1 (#4365), but it is still early to disable the tests for them

But that's not true in 1.3, is it? Wouldn't testing be better than skipping here?

AkihiroSuda · 2020-07-28T08:55:30Z

I meant just cherry-picking codes from container_test.go.

joejulian · 2020-07-28T17:14:59Z

Right, but that cherry-pick skips the test for v1. b2ee432#diff-80b94ff9a9d56a9492f043f938353acbR666

Since v1 is not being deprecated in 1.3, by moving that one function we are able to actually test the code instead of skipping.

joejulian force-pushed the backport-4214 branch from ee29e41 to a7727e8 Compare July 3, 2020 22:30

joejulian force-pushed the backport-4214 branch from b371b30 to a0c9359 Compare July 3, 2020 23:07

joejulian force-pushed the backport-4214 branch from 7600b0e to 1f4c5e7 Compare July 3, 2020 23:25

joejulian commented Jul 3, 2020

View reviewed changes

Comment thread .github/workflows/ci.yml Outdated

joejulian force-pushed the backport-4214 branch from 1f4c5e7 to 3296413 Compare July 7, 2020 19:24

joejulian force-pushed the backport-4214 branch from a0a31dd to d0efef1 Compare July 8, 2020 00:03

joejulian force-pushed the backport-4214 branch from bbfe841 to 201bc3e Compare July 8, 2020 00:16

joejulian force-pushed the backport-4214 branch from 201bc3e to 4f90346 Compare July 8, 2020 05:27

joejulian marked this pull request as ready for review July 13, 2020 23:26

joejulian force-pushed the backport-4214 branch from 490bf8f to 6157140 Compare July 14, 2020 16:26

joejulian force-pushed the backport-4214 branch from ffb1cfb to b406fe3 Compare July 15, 2020 16:52

estesp changed the title ~~[backport] Transfer error to ErrNotFound when kill a not exist container, also add test case.~~ [release/1.3] backport: Transfer error to ErrNotFound when kill a not exist container, also add test case. Jul 15, 2020

estesp mentioned this pull request Jul 15, 2020

CI: remove an unreferenced variable #4377

Merged

joejulian force-pushed the backport-4214 branch from b406fe3 to ddd989c Compare July 15, 2020 17:31

estesp mentioned this pull request Jul 15, 2020

[release/1.3] Don't clash with GH Actions runner's containerd #4382

Closed

kzys mentioned this pull request Jul 22, 2020

[release/1.3 backport] snapshots/devmapper: suspend a device to avoid data corruption #4416

Merged

joejulian force-pushed the backport-4214 branch from 1c11319 to 9435bd5 Compare July 23, 2020 00:35

payall4u and others added 7 commits July 22, 2020 21:34

test: Do SynchronousDelete cleanup before testing ImageIsUnpacked

a7dca07

Simply delete the image will not clean up the snapshots. Signed-off-by: Li Yuxuan <[email protected]> (cherry picked from commit 19f7f3c)

Update to later version of critools with timing fix.

6bc1734

Signed-off-by: Phil Estes <[email protected]> (cherry picked from commit b47c7ec)

joejulian force-pushed the backport-4214 branch from 9435bd5 to 6bc1734 Compare July 23, 2020 04:34

fuweid approved these changes Jul 24, 2020

View reviewed changes

kzys mentioned this pull request Jul 24, 2020

[release/1.3 backport] Allow empty scope authorization #4422

Merged

AkihiroSuda reviewed Jul 25, 2020

View reviewed changes

AkihiroSuda approved these changes Jul 28, 2020

View reviewed changes

AkihiroSuda merged commit 4f6d25c into containerd:release/1.3 Jul 28, 2020

Conversation

joejulian commented Jul 3, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

theopenlab-ci Bot commented Jul 3, 2020

Uh oh!

theopenlab-ci Bot commented Jul 3, 2020

Uh oh!

theopenlab-ci Bot commented Jul 3, 2020

Uh oh!

theopenlab-ci Bot commented Jul 3, 2020

Uh oh!

Uh oh!

theopenlab-ci Bot commented Jul 7, 2020

Uh oh!

theopenlab-ci Bot commented Jul 7, 2020

Uh oh!

theopenlab-ci Bot commented Jul 8, 2020

Uh oh!

theopenlab-ci Bot commented Jul 8, 2020

Uh oh!

theopenlab-ci Bot commented Jul 8, 2020

Uh oh!

theopenlab-ci Bot commented Jul 8, 2020

Uh oh!

joejulian commented Jul 8, 2020

Uh oh!

joejulian commented Jul 13, 2020

Uh oh!

theopenlab-ci Bot commented Jul 14, 2020

Uh oh!

theopenlab-ci Bot commented Jul 14, 2020

Uh oh!

theopenlab-ci Bot commented Jul 14, 2020

Uh oh!

cpuguy83 commented Jul 14, 2020

Uh oh!

theopenlab-ci Bot commented Jul 15, 2020

Uh oh!

thaJeztah commented Jul 15, 2020

Uh oh!

estesp commented Jul 15, 2020

Uh oh!

theopenlab-ci Bot commented Jul 15, 2020

Uh oh!

theopenlab-ci Bot commented Jul 15, 2020

Uh oh!

joejulian commented Jul 15, 2020

Uh oh!

fuweid commented Jul 22, 2020

Uh oh!

thaJeztah commented Jul 22, 2020

Uh oh!

theopenlab-ci Bot commented Jul 23, 2020

Uh oh!

theopenlab-ci Bot commented Jul 23, 2020

Uh oh!

fuweid left a comment

Choose a reason for hiding this comment

Uh oh!

AkihiroSuda Jul 25, 2020

Choose a reason for hiding this comment

Uh oh!

AkihiroSuda Jul 25, 2020

Choose a reason for hiding this comment

Uh oh!

joejulian commented Jul 27, 2020

Uh oh!

AkihiroSuda commented Jul 28, 2020

Uh oh!

joejulian commented Jul 28, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

joejulian commented Jul 3, 2020 •

edited

Loading