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

[18.06] vendor: update containerd to b41633746 #15

Merged
merged 1 commit into from
Jul 10, 2018
Merged

[18.06] vendor: update containerd to b41633746 #15

merged 1 commit into from
Jul 10, 2018

Conversation

thaJeztah
Copy link
Member

Cherry-pick of moby#37411 for 18.06

git checkout -b 18.06-backport-vendor-containerd ce-engine/18.06
git cherry-pick -s -S -x f0e61582664d16c5a608c3a742cc12b6b006bca6

no conflicts, cherry-pick was clean

Brings in updated MaskPaths that are used in code paths directly using containerd (eg. buildkit) to address CVE-2018-10892 for those paths (containerd equivalent of moby#37404)

Full diffs:

@tonistiigi @thaJeztah
vendor: update containerd to b41633746
5e14dc7 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit f0e6158)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah added this to the 18.06.0 milestone Jul 9, 2018
@thaJeztah
Copy link
Member Author

z/s390x https://jenkins.dockerproject.org/job/Docker-PRs-s390x/10326/console failing on a flaky test, tracked through moby#32673

09:57:56 FAIL: docker_api_swarm_test.go:296: DockerSwarmSuite.TestAPISwarmLeaderElection
09:57:56 
09:57:56 [da2b4d49d2f62] waiting for daemon to start
09:57:56 [da2b4d49d2f62] daemon started
09:57:56 
09:57:56 [d2ea874610a3f] waiting for daemon to start
09:57:56 [d2ea874610a3f] daemon started
09:57:56 
09:57:56 [dfa813efc7a77] waiting for daemon to start
09:57:56 [dfa813efc7a77] daemon started
09:57:56 
09:57:56 [da2b4d49d2f62] exiting daemon
09:57:56 assertion failed: error is not nil: Error response from daemon: rpc error: code = DeadlineExceeded desc = context deadline exceeded
09:57:56 [d2ea874610a3f] daemon started
09:57:56 Attempt #2: daemon is still running with pid 10343
09:57:56 [d2ea874610a3f] exiting daemon
09:57:56 [dfa813efc7a77] exiting daemon

@thaJeztah
Copy link
Member Author

Janky https://jenkins.dockerproject.org/job/Docker-PRs/50022/console also failing on the same flaky test

10:04:47 FAIL: docker_api_swarm_test.go:296: DockerSwarmSuite.TestAPISwarmLeaderElection
10:04:47 
10:04:47 [df9696a4c5d38] waiting for daemon to start
10:04:47 [df9696a4c5d38] daemon started
10:04:47 
10:04:47 [dcf3351cf97a6] waiting for daemon to start
10:04:47 [dcf3351cf97a6] daemon started
10:04:47 
10:04:47 [de4c85d404e6f] waiting for daemon to start
10:04:47 [de4c85d404e6f] daemon started
10:04:47 
10:04:47 [df9696a4c5d38] exiting daemon
10:04:47 assertion failed: error is not nil: Error response from daemon: rpc error: code = DeadlineExceeded desc = context deadline exceeded
10:04:47 [dcf3351cf97a6] exiting daemon
10:04:47 [de4c85d404e6f] exiting daemon

@thaJeztah
Copy link
Member Author

Argh; s390x https://jenkins.dockerproject.org/job/Docker-PRs-s390x/10327/console hitting another flaky (moby#36903)

12:22:27 FAIL: docker_api_swarm_service_test.go:62: DockerSwarmSuite.TestAPISwarmServicesCreate
12:22:27 
12:22:27 [d1ce8a9a425de] waiting for daemon to start
12:22:27 [d1ce8a9a425de] daemon started
12:22:27 
12:22:27 docker_api_swarm_service_test.go:93:
12:22:27     waitAndAssert(c, defaultReconciliationTimeout, d.CheckActiveContainerCount, checker.Equals, 0)
12:22:27 docker_utils_test.go:435:
12:22:27     c.Assert(v, checker, args...)
12:22:27 ... obtained int = 1
12:22:27 ... expected int = 0
12:22:27 ... output: "3592939f8b49\n"
12:22:27 
12:22:27 [d1ce8a9a425de] exiting daemon

@thaJeztah
Copy link
Member Author

Another flaky on Janky

12:30:11 FAIL: check_test.go:347: DockerSwarmSuite.TearDownTest
12:30:11 
12:30:11 check_test.go:352:
12:30:11     d.Stop(c)
12:30:11 /go/src/github.com/docker/docker/internal/test/daemon/daemon.go:401:
12:30:11     t.Fatalf("Error while stopping the daemon %s : %v", d.id, err)
12:30:11 ... Error: Error while stopping the daemon d537cccb678d6 : exit status 130
12:30:11 
12:30:11 
12:30:11 ----------------------------------------------------------------------
12:30:11 PANIC: docker_api_swarm_test.go:359: DockerSwarmSuite.TestAPISwarmRaftQuorum
12:30:11 
12:30:11 [d537cccb678d6] waiting for daemon to start
12:30:11 [d537cccb678d6] daemon started
12:30:11 
12:30:11 [d239e21bf9b57] waiting for daemon to start
12:30:11 [d239e21bf9b57] daemon started
12:30:11 
12:30:11 [d549d654577e5] waiting for daemon to start
12:30:11 [d549d654577e5] daemon started
12:30:11 
12:30:11 [d239e21bf9b57] exiting daemon
12:30:11 [d549d654577e5] exiting daemon
12:30:11 [d239e21bf9b57] waiting for daemon to start
12:30:11 [d239e21bf9b57] daemon started
12:30:11 
12:30:11 [d537cccb678d6] daemon started
12:30:11 Attempt #2: daemon is still running with pid 30292
12:30:11 Attempt #3: daemon is still running with pid 30292
12:30:11 Attempt #4: daemon is still running with pid 30292
12:30:11 [d537cccb678d6] exiting daemon
12:30:11 ... Panic: Fixture has panicked (see related PANIC)

andrewhsu
andrewhsu approved these changes Jul 10, 2018
View reviewed changes
Copy link

@andrewhsu andrewhsu left a comment

Choose a reason for hiding this comment

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

LGTM

@andrewhsu andrewhsu merged commit 6abf11d into docker-archive:18.06 Jul 10, 2018
@thaJeztah thaJeztah deleted the 18.06-backport-vendor-containerd branch July 10, 2018 16:58
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@andrewhsu andrewhsu andrewhsu approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
18.06.0
Development

Successfully merging this pull request may close these issues.
3 participants
@thaJeztah @andrewhsu @tonistiigi