[17.12] bump containerd 1.0.2 #434

cpuguy83 · 2018-02-21T15:47:43Z

Backport containerd 1.0.2 bump - moby/moby#36308

git cherry-pick -s -x -Xsubtree=components/engine c2fb6db55be08da95b15bee730a191094f846577

Also bumps vendors to match contained 1.0.2 vendors... these don't match moby/moby since moby/moby is not tracking 1.0.2 for vendored deps.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit c2fb6db) Signed-off-by: Brian Goff <cpuguy83@gmail.com>

thaJeztah · 2018-02-21T20:18:02Z

16:08:46 # github.com/docker/docker/daemon/graphdriver/graphtest
16:08:46 daemon/graphdriver/graphtest/graphbench_unix.go:248:13: undefined: driver.ReadFile
16:08:46 daemon/graphdriver/graphtest/testutil.go:38:12: undefined: driver.WriteFile
16:08:46 daemon/graphdriver/graphtest/testutil.go:44:12: undefined: driver.WriteFile
16:08:46 daemon/graphdriver/graphtest/testutil.go:48:9: undefined: driver.WriteFile
16:08:46 daemon/graphdriver/graphtest/testutil.go:58:22: undefined: driver.ReadFile
16:08:46 daemon/graphdriver/graphtest/testutil.go:77:9: undefined: driver.WriteFile
16:08:46 daemon/graphdriver/graphtest/testutil.go:135:14: undefined: driver.WriteFile
16:08:46 daemon/graphdriver/graphtest/testutil.go:170:15: undefined: driver.WriteFile
16:08:46 daemon/graphdriver/graphtest/testutil.go:177:15: undefined: driver.WriteFile
16:08:46 daemon/graphdriver/graphtest/testutil.go:206:24: undefined: driver.ReadFile
16:08:46 daemon/graphdriver/graphtest/testutil.go:206:24: too many errors

thaJeztah · 2018-02-21T20:23:42Z

components/engine/vendor.conf

 github.com/containerd/fifo fbfb6a11ec671efbe94ad1c12c2e98773f19e1e6
-github.com/containerd/continuity 35d55c5e8dd23b32037d56cf97174aff3efdfa83
-github.com/containerd/cgroups 29da22c6171a4316169f9205ab6c49f59b5b852f
+github.com/containerd/continuity cf279e6ac893682272b4479d4c67fd3abf878b4e


this one was already 4 commits ahead; containerd/continuity@cf279e6...35d55c5

I removed this change.

thaJeztah · 2018-02-21T20:25:43Z

components/engine/vendor.conf

 github.com/containerd/typeurl f6943554a7e7e88b3c14aad190bf05932da84788
 github.com/dmcgowan/go-tar go1.10
-github.com/stevvooe/ttrpc 76e68349ad9ab4d03d764c713826d31216715e4f
+github.com/stevvooe/ttrpc d4528379866b0ce7e9d71f3eb96f0582fc374577


full diff: containerd/ttrpc@76e6834...d452837

thaJeztah · 2018-02-21T20:25:53Z

components/engine/vendor.conf

 github.com/containerd/console 84eeaae905fa414d03e07bcd6c8d3f19e7cf180e
-github.com/containerd/go-runc ed1cbe1fc31f5fb2359d3a54b6330d1a097858b7
+github.com/containerd/go-runc 4f6e87ae043f859a38255247b49c9abc262d002f


full diff: containerd/go-runc@ed1cbe1...4f6e87a

thaJeztah · 2018-02-21T20:26:13Z

components/engine/vendor.conf

-github.com/containerd/continuity 35d55c5e8dd23b32037d56cf97174aff3efdfa83
-github.com/containerd/cgroups 29da22c6171a4316169f9205ab6c49f59b5b852f
+github.com/containerd/continuity cf279e6ac893682272b4479d4c67fd3abf878b4e
+github.com/containerd/cgroups c0710c92e8b3a44681d1321dcfd1360fc5c6c089


full diff: containerd/cgroups@29da22c...c0710c9

thaJeztah · 2018-02-21T20:26:56Z

components/engine/vendor.conf

@@ -104,15 +104,15 @@ github.com/googleapis/gax-go da06d194a00e19ce00d9011a13931c3f6f6887c7
 google.golang.org/genproto d80a6e20e776b0b17a324d0ba1ab50a39c8e8944

 # containerd
-github.com/containerd/containerd 89623f28b87a6004d4b785663257362d1658a729 # v1.0.0
+github.com/containerd/containerd cfd04396dc68220d1cecbe686a6cc3aa5ce3667c # v1.0.2


full diff: containerd/containerd@89623f2...cfd0439

Signed-off-by: Brian Goff <cpuguy83@gmail.com>

This option was unused and was trying to set a field that doesn't exist anymore. Signed-off-by: Brian Goff <cpuguy83@gmail.com>

thaJeztah

LGTM (if green)

thaJeztah · 2018-02-21T23:23:16Z

DockerSwarmSuite.TestAPISwarmServicesUpdateStartFirst failing in CE and s390x; Is that a flaky test?

https://jenkins.dockerproject.org/job/docker-ce-pr/611/execution/node/748/log/

21:20:52 ----------------------------------------------------------------------
21:20:52 FAIL: check_test.go:366: DockerSwarmSuite.TearDownTest
21:20:52 
21:20:52 check_test.go:371:
21:20:52     d.Stop(c)
21:20:52 daemon/daemon.go:395:
21:20:52     t.Fatalf("Error while stopping the daemon %s : %v", d.id, err)
21:20:52 ... Error: Error while stopping the daemon de1035ae49ef1 : exit status 130
21:20:52 
21:20:52 
21:20:52 ----------------------------------------------------------------------
21:20:52 PANIC: docker_api_swarm_service_test.go:201: DockerSwarmSuite.TestAPISwarmServicesUpdateStartFirst
21:20:52 
21:20:52 [de1035ae49ef1] waiting for daemon to start
21:20:52 [de1035ae49ef1] daemon started
21:20:52 
21:20:52 [de1035ae49ef1] daemon started
21:20:52 Attempt #2: daemon is still running with pid 32117
21:20:52 Attempt #3: daemon is still running with pid 32117
21:20:52 Attempt #4: daemon is still running with pid 32117
21:20:52 [de1035ae49ef1] exiting daemon
21:20:52 ... Panic: Fixture has panicked (see related PANIC)
21:20:52

https://jenkins.dockerproject.org/job/docker-ce-pr-s390x/406/execution/node/458/log/

21:14:54 ----------------------------------------------------------------------
21:14:54 FAIL: check_test.go:366: DockerSwarmSuite.TearDownTest
21:14:54 
21:14:54 check_test.go:371:
21:14:54     d.Stop(c)
21:14:54 daemon/daemon.go:395:
21:14:54     t.Fatalf("Error while stopping the daemon %s : %v", d.id, err)
21:14:54 ... Error: Error while stopping the daemon d94caeef2a019 : exit status 130
21:14:54 
21:14:54 
21:14:54 ----------------------------------------------------------------------
21:14:54 PANIC: docker_api_swarm_service_test.go:201: DockerSwarmSuite.TestAPISwarmServicesUpdateStartFirst
21:14:54 
21:14:54 [d94caeef2a019] waiting for daemon to start
21:14:54 [d94caeef2a019] daemon started
21:14:54 
21:14:54 [d94caeef2a019] daemon started
21:14:54 Attempt #2: daemon is still running with pid 300
21:14:54 Attempt #3: daemon is still running with pid 300
21:14:54 Attempt #4: daemon is still running with pid 300
21:14:54 [d94caeef2a019] exiting daemon
21:14:54 ... Panic: Fixture has panicked (see related PANIC)
21:14:54

cberner · 2018-02-23T19:31:03Z

@cpuguy83 , @thaJeztah just checking in. Will this be in 17.12.1?

cpuguy83 · 2018-02-23T19:33:45Z

@thaJeztah I don't know, how do we rebuild?

@cberner If we can resolve issues in time.

cpuguy83 · 2018-02-23T19:34:41Z

I have requested that this be considered a p0 for 1.12.1.

thaJeztah · 2018-02-23T19:38:08Z

@seemethere can you restart CI?

seemethere · 2018-02-23T19:47:29Z

@thaJeztah done

sebbrandt87 · 2018-02-27T17:39:40Z

What about the failing ce-tests-s390x?

cpuguy83 · 2018-02-27T19:51:21Z

@seemethere

sebbrandt87 · 2018-02-27T22:26:32Z

Cannot contact s390x-ubuntu-22: java.io.IOException: Remote call on JNLP4-connect connection from ip-172-31-0-7.us-west-2.compute.internal/172.31.0.7:18173 failed

thaJeztah · 2018-02-27T22:29:23Z

Looks like this test is flaky DockerSwarmSuite.TestAPISwarmServicesUpdateStartFirst https://jenkins.dockerproject.org/job/docker-ce-pr-s390x/422/execution/node/393/log/

21:52:17 PASS: docker_api_swarm_service_test.go:141: DockerSwarmSuite.TestAPISwarmServicesUpdate	31.527s
21:52:58 
21:52:58 ----------------------------------------------------------------------
21:52:58 FAIL: check_test.go:366: DockerSwarmSuite.TearDownTest
21:52:58 
21:52:58 check_test.go:371:
21:52:58     d.Stop(c)
21:52:58 daemon/daemon.go:395:
21:52:58     t.Fatalf("Error while stopping the daemon %s : %v", d.id, err)
21:52:58 ... Error: Error while stopping the daemon d59e6f1144b65 : exit status 130
21:52:58 
21:52:58 
21:52:58 ----------------------------------------------------------------------
21:52:58 PANIC: docker_api_swarm_service_test.go:201: DockerSwarmSuite.TestAPISwarmServicesUpdateStartFirst
21:52:58 
21:52:58 [d59e6f1144b65] waiting for daemon to start
21:52:58 [d59e6f1144b65] daemon started
21:52:58 
21:52:58 [d59e6f1144b65] daemon started
21:52:58 Attempt #2: daemon is still running with pid 839
21:52:58 Attempt #3: daemon is still running with pid 839
21:52:58 Attempt #4: daemon is still running with pid 839
21:52:58 [d59e6f1144b65] exiting daemon
21:52:58 ... Panic: Fixture has panicked (see related PANIC)
21:52:58

sebbrandt87 · 2018-02-28T07:43:22Z

I guess the plan is now to fix the flaky test?

cpuguy83 · 2018-02-28T14:39:35Z

I think that is a legit swarmkit problem, which seems to be easily triggered on s390x. Hitting it on moby/moby as well.

cpuguy83 · 2018-03-01T16:52:22Z

Well, 17.12.1 is already cut.

cpuguy83 · 2018-04-23T16:10:44Z

Closing since this is passed the 17.12 support window.

[19.03 backport] rootless: fix proxying UDP packets Upstream-commit: ec50d8f81462c8fb42ad1a4334899a5a1cf0c2e4 Component: engine

Bump containerd to 1.0.2 (cfd04396dc68220d1cecbe686a6cc3aa5ce3667c)

b693449

Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit c2fb6db) Signed-off-by: Brian Goff <cpuguy83@gmail.com>

andrewhsu changed the title ~~Bump containerd 1.02~~ [17.12] bump containerd 1.02 Feb 21, 2018

andrewhsu changed the title ~~[17.12] bump containerd 1.02~~ [17.12] bump containerd 1.0.2 Feb 21, 2018

andrewhsu added this to the 17.12.1 milestone Feb 21, 2018

andrewhsu requested a review from thaJeztah February 21, 2018 19:57

thaJeztah suggested changes Feb 21, 2018

View reviewed changes

cpuguy83 added 2 commits February 21, 2018 15:50

Bump containder vendor deps to match 1.0.2 vendors

106a470

Signed-off-by: Brian Goff <cpuguy83@gmail.com>

Remove WithSubrepaer which isn't used

63da974

This option was unused and was trying to set a field that doesn't exist anymore. Signed-off-by: Brian Goff <cpuguy83@gmail.com>

cpuguy83 force-pushed the bump_c8d_1_02 branch from be279ae to 63da974 Compare February 21, 2018 20:50

thaJeztah approved these changes Feb 21, 2018

View reviewed changes

cberner mentioned this pull request Mar 5, 2018

Killing docker-containerd breaks interaction with containers moby/moby#36002

Closed

cpuguy83 mentioned this pull request Mar 16, 2018

docker-containerd can not build new docker-containerd-shim after killed docker-containerd-shim process moby/moby#36559

Closed

andrewhsu removed this from the 17.12.1 milestone Mar 23, 2018

cpuguy83 closed this Apr 23, 2018

cpuguy83 deleted the bump_c8d_1_02 branch April 23, 2018 16:10

docker-jenkins pushed a commit that referenced this pull request Jan 20, 2020

Merge pull request #434 from AkihiroSuda/bump-up-rootlesskit-1903

10edafe

[19.03 backport] rootless: fix proxying UDP packets Upstream-commit: ec50d8f81462c8fb42ad1a4334899a5a1cf0c2e4 Component: engine

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[17.12] bump containerd 1.0.2 #434

[17.12] bump containerd 1.0.2 #434

cpuguy83 commented Feb 21, 2018

thaJeztah commented Feb 21, 2018

thaJeztah Feb 21, 2018

cpuguy83 Feb 21, 2018

thaJeztah Feb 21, 2018

thaJeztah Feb 21, 2018

thaJeztah Feb 21, 2018

thaJeztah Feb 21, 2018

thaJeztah left a comment

thaJeztah commented Feb 21, 2018

cberner commented Feb 23, 2018

cpuguy83 commented Feb 23, 2018

cpuguy83 commented Feb 23, 2018

thaJeztah commented Feb 23, 2018

seemethere commented Feb 23, 2018

sebbrandt87 commented Feb 27, 2018

cpuguy83 commented Feb 27, 2018

sebbrandt87 commented Feb 27, 2018

thaJeztah commented Feb 27, 2018 •

edited

Loading

sebbrandt87 commented Feb 28, 2018

cpuguy83 commented Feb 28, 2018 •

edited

Loading

cpuguy83 commented Mar 1, 2018

cpuguy83 commented Apr 23, 2018

[17.12] bump containerd 1.0.2 #434

[17.12] bump containerd 1.0.2 #434

Conversation

cpuguy83 commented Feb 21, 2018

thaJeztah commented Feb 21, 2018

thaJeztah Feb 21, 2018

Choose a reason for hiding this comment

cpuguy83 Feb 21, 2018

Choose a reason for hiding this comment

thaJeztah Feb 21, 2018

Choose a reason for hiding this comment

thaJeztah Feb 21, 2018

Choose a reason for hiding this comment

thaJeztah Feb 21, 2018

Choose a reason for hiding this comment

thaJeztah Feb 21, 2018

Choose a reason for hiding this comment

thaJeztah left a comment

Choose a reason for hiding this comment

thaJeztah commented Feb 21, 2018

cberner commented Feb 23, 2018

cpuguy83 commented Feb 23, 2018

cpuguy83 commented Feb 23, 2018

thaJeztah commented Feb 23, 2018

seemethere commented Feb 23, 2018

sebbrandt87 commented Feb 27, 2018

cpuguy83 commented Feb 27, 2018

sebbrandt87 commented Feb 27, 2018

thaJeztah commented Feb 27, 2018 • edited Loading

sebbrandt87 commented Feb 28, 2018

cpuguy83 commented Feb 28, 2018 • edited Loading

cpuguy83 commented Mar 1, 2018

cpuguy83 commented Apr 23, 2018

thaJeztah commented Feb 27, 2018 •

edited

Loading

cpuguy83 commented Feb 28, 2018 •

edited

Loading