Skip to content

Bump containerd to d97a907f#37877

Merged
thaJeztah merged 1 commit intomoby:masterfrom
microsoft:jjh/bumpcontainerd
Sep 19, 2018
Merged

Bump containerd to d97a907f#37877
thaJeztah merged 1 commit intomoby:masterfrom
microsoft:jjh/bumpcontainerd

Conversation

@lowenna
Copy link
Member

@lowenna lowenna commented Sep 18, 2018

Signed-off-by: John Howard [email protected]

This bumps containerd to d97a907f7f781c0ab8340877d8e6b53cc7f1c2f6. This is specifically to pick up this fix containerd/containerd#2634 removing boltdb which has a bug on Windows, and moving to bbolt, the maintained fork with the fix instead.

This PR directly relates to #37843 where there's a large dependency chain involved here to get all related components moved to bbolt. @thaJeztah @dmcgowan PTAL.

Note - there isn't a tagged release of v1.2 yet containing this fix, hence using the latest commit ID on master as at the time of writing.

thaJeztah
thaJeztah approved these changes Sep 18, 2018
View reviewed changes
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

SGTM

vendor.conf Outdated
Copy link
Member

@thaJeztah thaJeztah Sep 18, 2018

Choose a reason for hiding this comment

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

Is a cherry-pick opened for the patch to get it into the 1.2 branch in containerd?

Copy link
Member Author

@lowenna lowenna Sep 18, 2018

Choose a reason for hiding this comment

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

@dmcgowan Not sure how you're cutting 1.2, or just refreshing from master on each release?

Copy link
Member

@thaJeztah thaJeztah Sep 19, 2018

Choose a reason for hiding this comment

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

Oh, nevermind, I see that the 1.2-beta's are still tagged from master, and that there's no 1.2 branch yet

@thaJeztah
Copy link
Member

thaJeztah commented Sep 18, 2018

Oops, looks like there's an issue with vendoring;

16:11:10 The result of vndr differs
16:11:10 
16:11:10 ?? vendor/github.com/containerd/continuity/context.go
16:11:10 ?? vendor/github.com/containerd/continuity/digests.go
16:11:10 ?? vendor/github.com/containerd/continuity/groups_unix.go
16:11:10 ?? vendor/github.com/containerd/continuity/hardlinks.go
16:11:10 ?? vendor/github.com/containerd/continuity/hardlinks_unix.go
16:11:10 ?? vendor/github.com/containerd/continuity/hardlinks_windows.go
16:11:10 ?? vendor/github.com/containerd/continuity/ioutils.go
16:11:10 ?? vendor/github.com/containerd/continuity/manifest.go
16:11:10 ?? vendor/github.com/containerd/continuity/proto/
16:11:10 ?? vendor/github.com/containerd/continuity/resource.go
16:11:10 ?? vendor/github.com/containerd/continuity/resource_unix.go
16:11:10 ?? vendor/github.com/containerd/continuity/resource_windows.go
16:11:10

@thaJeztah thaJeztah added the status/failing-ci Indicates that the PR in its current state fails the test suite label Sep 18, 2018
@lowenna
Copy link
Member Author

lowenna commented Sep 18, 2018

Yeah, looks like containerd is pulling in new bits of continuity. Did a revendor on containerd/continuity without bumping the commit. Hopefully should work this time.

@lowenna
Copy link
Member Author

lowenna commented Sep 18, 2018

Nope, have had to bump containerd/continuity as well - now at f44b615e492bdfb371aae2f76ec694d9da1db537. Third time lucky....

Bump containerd to d97a907f
e57b2a8 
Signed-off-by: John Howard <[email protected]>
@lowenna
Copy link
Member Author

lowenna commented Sep 18, 2018 •
edited
Loading

And also bumped go-runc to 5a6d9f37cfa36b15efba46dc7ea349fa9b7143c3 to match containerd/containerd to avoid compilation error

@lowenna
Copy link
Member Author

lowenna commented Sep 18, 2018

Vendor passes now 😺

@lowenna lowenna removed the status/failing-ci Indicates that the PR in its current state fails the test suite label Sep 18, 2018
@lowenna lowenna mentioned this pull request Sep 18, 2018
Merged
@codecov
Copy link

codecov bot commented Sep 18, 2018

Codecov Report

❗ No coverage uploaded for pull request base (master@d6a7c22). Click here to learn what that means.
The diff coverage is n/a.

@@            Coverage Diff            @@
##             master   #37877   +/-   ##
=========================================
  Coverage          ?   36.11%           
=========================================
  Files             ?      610           
  Lines             ?    45083           
  Branches          ?        0           
=========================================
  Hits              ?    16281           
  Misses            ?    26563           
  Partials          ?     2239

thaJeztah
thaJeztah approved these changes Sep 19, 2018
View reviewed changes
Copy link
Member

@thaJeztah thaJeztah 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
Copy link
Member

thaJeztah commented Sep 19, 2018 •
edited
Loading

Full diffs;

@lowenna
Copy link
Member Author

lowenna commented Sep 19, 2018

@dmcgowan @crosbymichael You guys OK with this? I should get this in first before revendoring moby/buildkit which already has the PR merged to bump its version of containerd and move to bbolt. Thx.

@crosbymichael
Copy link
Contributor

crosbymichael commented Sep 19, 2018

LGTM

@thaJeztah thaJeztah merged commit 9c65b22 into moby:master Sep 19, 2018
@lowenna lowenna deleted the jjh/bumpcontainerd branch September 19, 2018 18:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@thaJeztah thaJeztah thaJeztah approved these changes

Assignees

No one assigned

Labels

area/runtime Runtime status/2-code-review

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@lowenna @thaJeztah @crosbymichael @GordonTheTurtle