Skip to content

[release/1.3 backport] Binary IO fixes and tests#4278

Merged
mxpv merged 3 commits intocontainerd:release/1.3from
kzys:1.3-backport-issue-4195
May 21, 2020
Merged

[release/1.3 backport] Binary IO fixes and tests#4278
mxpv merged 3 commits intocontainerd:release/1.3from
kzys:1.3-backport-issue-4195

Conversation

@kzys
Copy link
Copy Markdown
Member

@kzys kzys commented May 21, 2020

Backport of #4195.

I know that we may not have 1.3.5 anytime soon though. Let me know if we have the right way to backport changes!

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci bot commented May 21, 2020

Build succeeded.

mxpv added 3 commits May 21, 2020 10:48
containerd loads timeout values from config.toml and populated those
values to `timeout` package at launch. So when using `timeout` package
from shim, there are default values and config file is ignored.
So use a hardcoded value for binary IO.

Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
@kzys kzys force-pushed the 1.3-backport-issue-4195 branch from b0d2d98 to 0cca78f Compare May 21, 2020 17:49
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci bot commented May 21, 2020

Build succeeded.

Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Copy Markdown
Member

@mxpv mxpv left a comment

Choose a reason for hiding this comment

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

LGTM

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants