Skip to content
This repository has been archived by the owner on Oct 13, 2023. It is now read-only.

[18.09 backport] Update containerd to v1.2.8 #283

Merged

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Jun 14, 2019

backport of moby#39364 and moby#39786 for 18.09

created on top of #194 - only the last commit is new

From the release notes: https://github.com/containerd/containerd/releases/tag/v1.2.7

Welcome to the v1.2.7 release of containerd!

The seventh patch release for containerd 1.2 introduces OCI image
descriptor annotation support and contains fixes for containerd shim logs,
container stop/deletion, cri plugin and selinux.

It also contains several important bug fixes for goroutine and file
descriptor leakage in containerd and containerd shims.

Notable Updates

@thaJeztah thaJeztah added this to the 18.09.7 milestone Jun 14, 2019
@thaJeztah
Copy link
Member Author

marked as "WIP" because upstream wasn't merged yet

@thaJeztah thaJeztah changed the title [WIP][18.09 backport] Update containerd to v1.2.7 [18.09 backport] Update containerd to v1.2.7 Jun 17, 2019
@thaJeztah thaJeztah force-pushed the 18.09_backport_bump_containerd_v1.2.7 branch from 0e9bf91 to e175083 Compare June 20, 2019 09:27
@thaJeztah
Copy link
Member Author

Rebased, because #194 was merged

@thaJeztah thaJeztah changed the title [18.09 backport] Update containerd to v1.2.7 [WIP][18.09 backport] Update containerd to v1.2.7 Jun 24, 2019
@andrewhsu andrewhsu modified the milestones: 18.09.7, 18.09.8 Jun 27, 2019
@thaJeztah thaJeztah modified the milestones: 18.09.8, 18.09.9 Jul 18, 2019
@thaJeztah thaJeztah changed the title [WIP][18.09 backport] Update containerd to v1.2.7 [18.09 backport] Update containerd to v1.2.7 Jul 20, 2019
@thaJeztah thaJeztah force-pushed the 18.09_backport_bump_containerd_v1.2.7 branch from e175083 to a1fe9c9 Compare July 20, 2019 09:34
@thaJeztah
Copy link
Member Author

rebased again to trigger CI

@thaJeztah thaJeztah force-pushed the 18.09_backport_bump_containerd_v1.2.7 branch from a1fe9c9 to 9503fa4 Compare August 7, 2019 21:02
@thaJeztah
Copy link
Member Author

rebased (again) because CI results were purged (again 😞)

Copy link

@kolyshkin kolyshkin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@thaJeztah thaJeztah force-pushed the 18.09_backport_bump_containerd_v1.2.7 branch from 9503fa4 to 6436e66 Compare August 26, 2019 22:04
@thaJeztah thaJeztah changed the title [18.09 backport] Update containerd to v1.2.7 [18.09 backport] Update containerd to v1.2.8 Aug 26, 2019
@thaJeztah thaJeztah modified the milestones: 18.09.9, 18.09.10 Aug 30, 2019
@thaJeztah thaJeztah force-pushed the 18.09_backport_bump_containerd_v1.2.7 branch from 6436e66 to 95aa721 Compare September 24, 2019 18:52
@kolyshkin
Copy link

kolyshkin commented Sep 26, 2019

[2019-09-24T19:24:05.764Z] === RUN   TestBuildWithHugeFile
[2019-09-24T19:24:52.405Z] 
[2019-09-24T19:24:52.405Z] ----------------------------------------------------------------------
[2019-09-24T19:24:52.405Z] FAIL: check_test.go:347: DockerSwarmSuite.TearDownTest
[2019-09-24T19:24:52.405Z] 
[2019-09-24T19:24:52.405Z] check_test.go:352:
[2019-09-24T19:24:52.405Z]     d.Stop(c)
[2019-09-24T19:24:52.405Z] /go/src/github.com/docker/docker/internal/test/daemon/daemon.go:414:
[2019-09-24T19:24:52.405Z]     t.Fatalf("Error while stopping the daemon %s : %v", d.id, err)
[2019-09-24T19:24:52.405Z] ... Error: Error while stopping the daemon d474da107fa40 : remove /go/src/github.com/docker/docker/bundles/test-integration/3/DockerSwarmSuite.TestAPISwarmLeaveOnPendingJoin/d474da107fa40/docker.pid: no such file or directory
[2019-09-24T19:24:52.405Z] 
[2019-09-24T19:24:52.405Z] 
[2019-09-24T19:24:52.405Z] ----------------------------------------------------------------------
[2019-09-24T19:24:52.405Z] PANIC: docker_api_swarm_test.go:432: DockerSwarmSuite.TestAPISwarmLeaveOnPendingJoin
[2019-09-24T19:24:52.405Z] 
[2019-09-24T19:24:52.405Z] Creating a new daemon at: /go/src/github.com/docker/docker/bundles/test-integration/3/DockerSwarmSuite.TestAPISwarmLeaveOnPendingJoin
[2019-09-24T19:24:52.405Z] [de1b69f6c1e27] waiting for daemon to start
[2019-09-24T19:24:52.405Z] [de1b69f6c1e27] daemon started
[2019-09-24T19:24:52.405Z] 
[2019-09-24T19:24:52.405Z] Creating a new daemon at: /go/src/github.com/docker/docker/bundles/test-integration/3/DockerSwarmSuite.TestAPISwarmLeaveOnPendingJoin
[2019-09-24T19:24:52.405Z] [d474da107fa40] waiting for daemon to start
[2019-09-24T19:24:52.405Z] [d474da107fa40] daemon started
[2019-09-24T19:24:52.405Z] 
[2019-09-24T19:24:52.405Z] waited for 156.299308ms (out of 30s)
[2019-09-24T19:24:52.405Z] [de1b69f6c1e27] exiting daemon
[2019-09-24T19:24:52.405Z] [d474da107fa40] daemon stop timeout
[2019-09-24T19:24:52.405Z] Attempt #2: daemon is still running with pid 14382
[2019-09-24T19:24:52.405Z] Attempt #3: daemon is still running with pid 14382
[2019-09-24T19:24:52.405Z] Attempt #4: daemon is still running with pid 14382
[2019-09-24T19:24:52.405Z] Attempt #5: daemon is still running with pid 14382
[2019-09-24T19:24:52.405Z] tried to interrupt daemon for 6 times, now try to kill it
[2019-09-24T19:24:52.405Z] ... Panic: Fixture has panicked (see related PANIC)

thaJeztah and others added 2 commits September 27, 2019 16:31
From the release notes: https://github.com/containerd/containerd/releases/tag/v1.2.7

> Welcome to the v1.2.7 release of containerd!
>
> The seventh patch release for containerd 1.2 introduces OCI image
> descriptor annotation support and contains fixes for containerd shim logs,
> container stop/deletion, cri plugin and selinux.
>
> It also contains several important bug fixes for goroutine and file
> descriptor leakage in containerd and containerd shims.
>
> Notable Updates
>
> - Support annotations in the OCI image descriptor, and filtering image by annotations. containerd/containerd#3254
> - Support context timeout in ttrpc which can help avoid containerd hangs when a shim is unresponsive. containerd/ttrpc#31
> - Fix a bug that containerd shim leaks goroutine and file descriptor after containerd restarts. containerd/ttrpc#37
> - Fix a bug that a container can't be deleted if first deletion attempt is canceled or timeout. containerd/containerd#3264
> - Fix a bug that containerd leaks file descriptor when using v2 containerd shims, e.g. containerd-shim-runc-v1. containerd/containerd#3273
> - Fix a bug that a container with lingering processes can't terminate when it shares pid namespace with another container. moby#38978
> - Fix a bug that containerd can't read shim logs after restart. containerd/containerd#3282
> - Fix a bug that shim_debug option is not honored for existing containerd shims after containerd restarts. containerd/containerd#3283
> - cri: Fix a bug that a container can't be stopped when the exit event is not successfully published by the containerd shim. containerd/containerd#3125, containerd/containerd#3177
> - cri: Fix a bug that exec process is not cleaned up if grpc context is canceled or timeout. contaienrd/cri#1159
> - Fix a selinux keyring labeling issue by updating runc to v1.0.0-rc.8 and selinux library to v1.2.2. opencontainers/selinux#50
> - Update ttrpc to f82148331ad2181edea8f3f649a1f7add6c3f9c2. containerd/containerd#3316
> - Update cri to 49ca74043390bc2eeea7a45a46005fbec58a3f88. containerd/containerd#3330

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit d5669ec)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
(cherry picked from commit 1264a85)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
4 participants