Skip to content

[release 1.0] Handle shim killed on restore#2110

Merged
estesp merged 3 commits intocontainerd:release/1.0from
crosbymichael:release-onclose
Feb 6, 2018
Merged

[release 1.0] Handle shim killed on restore#2110
estesp merged 3 commits intocontainerd:release/1.0from
crosbymichael:release-onclose

Conversation

@crosbymichael
Copy link
Copy Markdown
Member

Cherry pick of #2109

Contains the OnClose method for the client

Signed-off-by: Michael Crosby <[email protected]>
When restoring a task make sure that dead shims are handled.

Fixes containerd#2078

Signed-off-by: Michael Crosby <[email protected]>
Signed-off-by: Michael Crosby <[email protected]>
@stevvooe
Copy link
Copy Markdown
Member

stevvooe commented Feb 6, 2018

LGTM

@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #2110 into release/1.0 will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##           release/1.0    #2110   +/-   ##
============================================
  Coverage        50.56%   50.56%           
============================================
  Files               81       81           
  Lines             7169     7169           
============================================
  Hits              3625     3625           
  Misses            2849     2849           
  Partials           695      695
Flag Coverage Δ
#linux 50.56% <ø> (ø) ⬆️

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 6ddb0bd...d1d3fd0. Read the comment docs.

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

@estesp estesp merged commit 37a05d4 into containerd:release/1.0 Feb 6, 2018
@crosbymichael crosbymichael deleted the release-onclose branch February 6, 2018 19:16
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.

4 participants