Skip to content

Binary IO fixes and tests#4195

Merged
fuweid merged 3 commits intocontainerd:masterfrom
mxpv:binary-io
Apr 19, 2020
Merged

Binary IO fixes and tests#4195
fuweid merged 3 commits intocontainerd:masterfrom
mxpv:binary-io

Conversation

@mxpv
Copy link
Copy Markdown
Member

@mxpv mxpv commented Apr 17, 2020

This PR:

  • Addresses @fuweid's comment to cleanup allocated resources in case of error in NewBinaryIO.
  • Hardcodes SIGTERM timeout to 10 seconds. No longer rely on timeout package, since shim binary doesn't load config.toml file and hence doesn't contain configured timeouts.
  • Adds tests to make sure proper resource cleanup (by counting open descriptors).

mxpv added 3 commits April 17, 2020 15:06
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>
@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #4195 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #4195   +/-   ##
=======================================
  Coverage   38.35%   38.35%           
=======================================
  Files          90       90           
  Lines       12726    12726           
=======================================
  Hits         4881     4881           
  Misses       7179     7179           
  Partials      666      666           
Flag Coverage Δ
#windows 38.35% <ø> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d8506bf...917e764. Read the comment docs.

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci bot commented Apr 17, 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
Contributor

@Zyqsempai Zyqsempai 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

@fuweid fuweid left a comment

Choose a reason for hiding this comment

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

LGTM

@fuweid fuweid merged commit 5bfab78 into containerd:master Apr 19, 2020
@mxpv mxpv deleted the binary-io branch April 19, 2020 05:35
kzys pushed a commit to kzys/firecracker-containerd that referenced this pull request May 21, 2020
This change upgrades containerd to post-1.3.4 for including
containerd/containerd#4195.
kzys pushed a commit to kzys/firecracker-containerd that referenced this pull request May 21, 2020
This change upgrades containerd to post-1.3.4 for including
containerd/containerd#4195.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
kzys pushed a commit to kzys/firecracker-containerd that referenced this pull request May 21, 2020
This change upgrades containerd to post-1.3.4 for including
containerd/containerd#4195.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
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.

5 participants