Skip to content

Add timeout in load shim v2#3355

Merged
estesp merged 1 commit intocontainerd:masterfrom
Ace-Tang:avoid-start-hang
Jun 19, 2019
Merged

Add timeout in load shim v2#3355
estesp merged 1 commit intocontainerd:masterfrom
Ace-Tang:avoid-start-hang

Conversation

@Ace-Tang
Copy link
Copy Markdown
Contributor

add timeout in connect shim v2 avoid starting containerd hang

Signed-off-by: Ace-Tang [email protected]

add timeout in connect shim v2 avoid starting containerd hang

Signed-off-by: Ace-Tang <[email protected]>
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Jun 19, 2019

Build succeeded.

@codecov-io
Copy link
Copy Markdown

Codecov Report

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

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #3355   +/-   ##
=======================================
  Coverage   44.75%   44.75%           
=======================================
  Files         113      113           
  Lines       12513    12513           
=======================================
  Hits         5600     5600           
  Misses       6057     6057           
  Partials      856      856
Flag Coverage Δ
#linux 48.65% <ø> (ø) ⬆️
#windows 40.2% <ø> (ø) ⬆️

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 434f69e...95f9bbf. Read the comment docs.

@jterry75
Copy link
Copy Markdown
Contributor

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

@estesp estesp merged commit 4355a2a into containerd:master Jun 19, 2019
@crosbymichael
Copy link
Copy Markdown
Member

We should watch this change and do some stress testing for machines under load. Timeouts are hard because systems under heavy load can block for a while and apparently users are ok with it :(

@Ace-Tang
Copy link
Copy Markdown
Contributor Author

It hard to judge shim hang because of system or lock in shim or others, how about skip cleanupDeadShim if get Timeout error @crosbymichael

@Ace-Tang Ace-Tang deleted the avoid-start-hang branch June 19, 2019 14:48
Ace-Tang added a commit to Ace-Tang/containerd that referenced this pull request Jul 3, 2019
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