Skip to content

Shim hung 1.2 [backport from master]#3561

Merged
estesp merged 5 commits intocontainerd:release/1.2from
keloyang:shim-hung-1.2
Aug 20, 2019
Merged

Shim hung 1.2 [backport from master]#3561
estesp merged 5 commits intocontainerd:release/1.2from
keloyang:shim-hung-1.2

Conversation

@keloyang
Copy link
Copy Markdown
Contributor

#3540 also exists in branch release/1.x, this pr will backport the commits to release/1.2.

keloyang and others added 5 commits August 20, 2019 22:54
shim.Reap and shim.Default.Wait may deadlock, use Monitor.Notify
to fix this issue.

Signed-off-by: Shukui Yang <[email protected]>
Signed-off-by: Michael Crosby <[email protected]>
Signed-off-by: Shukui Yang <[email protected]>
Signed-off-by: Michael Crosby <[email protected]>
Signed-off-by: Shukui Yang <[email protected]>
Signed-off-by: Michael Crosby <[email protected]>
Signed-off-by: Shukui Yang <[email protected]>
Shim use non-blocking send now, there is no need to set bufferSize to 2048,
it's a waste.

Signed-off-by: Shukui Yang <[email protected]>
@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #3561 into release/1.2 will increase coverage by 0.14%.
The diff coverage is 0%.

Impacted file tree graph

@@               Coverage Diff               @@
##           release/1.2    #3561      +/-   ##
===============================================
+ Coverage        43.96%   44.11%   +0.14%     
===============================================
  Files              101      100       -1     
  Lines            10824    10788      -36     
===============================================
  Hits              4759     4759              
+ Misses            5326     5290      -36     
  Partials           739      739
Flag Coverage Δ
#linux 47.79% <0%> (+0.2%) ⬆️
#windows 41.12% <ø> (ø) ⬆️
Impacted Files Coverage Δ
runtime/v2/shim/shim_unix.go 0% <0%> (ø) ⬆️

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 b21e4f4...f1c661f. Read the comment docs.

1 similar comment
@codecov-io
Copy link
Copy Markdown

codecov-io commented Aug 20, 2019

Codecov Report

Merging #3561 into release/1.2 will increase coverage by 0.14%.
The diff coverage is 0%.

Impacted file tree graph

@@               Coverage Diff               @@
##           release/1.2    #3561      +/-   ##
===============================================
+ Coverage        43.96%   44.11%   +0.14%     
===============================================
  Files              101      100       -1     
  Lines            10824    10788      -36     
===============================================
  Hits              4759     4759              
+ Misses            5326     5290      -36     
  Partials           739      739
Flag Coverage Δ
#linux 47.79% <0%> (+0.2%) ⬆️
#windows 41.12% <ø> (ø) ⬆️
Impacted Files Coverage Δ
runtime/v2/shim/shim_unix.go 0% <0%> (ø) ⬆️

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 b21e4f4...f1c661f. Read the comment docs.

@crosbymichael
Copy link
Copy Markdown
Member

LGTM

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

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