Skip to content
This repository was archived by the owner on Apr 20, 2022. It is now read-only.

Update to containerd 1.2.2#14

Merged
Random-Liu merged 2 commits intogoogle:masterfrom
Random-Liu:update-to-containerd-1.2.2
Jan 30, 2019
Merged

Update to containerd 1.2.2#14
Random-Liu merged 2 commits intogoogle:masterfrom
Random-Liu:update-to-containerd-1.2.2

Conversation

@Random-Liu
Copy link
Member

Based on #13.

This PR:

  1. Update containerd to 1.2.2 to pick up fixes like [release/1.1] cherry-pick: Increase reaper buffer size containerd/containerd#2762;
  2. Port [release/1.2] Fix process locking and state management containerd/containerd#2803. Actually this is not necessary, but it helps it easy to port future fixes.

Copy link

@ianlewis ianlewis left a comment

Choose a reason for hiding this comment

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

LGTM

@ianlewis
Copy link

@Random-Liu
We may want to do something at some point to alleviate the need to port changes from containerd all the time. Maybe some kind of better API or library for shims to use? Do other shims depend on containerd in this way?

@Random-Liu
Copy link
Member Author

Random-Liu commented Jan 29, 2019

We may want to do something at some point to alleviate the need to port changes from containerd all the time. Maybe some kind of better API or library for shims to use? Do other shims depend on containerd in this way?

I think the containerd-shim code is expected to be eventually very stable, the porting change cases should be less and less. So I'm currently not too worry about that.

And it is good that we can get the same bug fix from containerd-shim, because it is more battle tested. :)

Signed-off-by: Lantao Liu <lantaol@google.com>
Signed-off-by: Lantao Liu <lantaol@google.com>
@Random-Liu Random-Liu force-pushed the update-to-containerd-1.2.2 branch from dfeac76 to 4213637 Compare January 30, 2019 02:52
@Random-Liu
Copy link
Member Author

Merge based on #14 (comment)

@Random-Liu Random-Liu merged commit 326bc9f into google:master Jan 30, 2019
@Random-Liu Random-Liu deleted the update-to-containerd-1.2.2 branch January 30, 2019 17:50
@ianlewis
Copy link

We may want to do something at some point to alleviate the need to port changes from containerd all the time. Maybe some kind of better API or library for shims to use? Do other shims depend on containerd in this way?

I think the containerd-shim code is expected to be eventually very stable, the porting change cases should be less and less. So I'm currently not too worry about that.

And it is good that we can get the same bug fix from containerd-shim, because it is more battle tested. :)

Yah, I'm just thinking I'd rather we were able to vendor that code as a library rather than merge it :)

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants