Skip to content

Add timeout and cancel to shim fifo open#2877

Merged
crosbymichael merged 1 commit intocontainerd:masterfrom
crosbymichael:fifo-timeout
Dec 14, 2018
Merged

Add timeout and cancel to shim fifo open#2877
crosbymichael merged 1 commit intocontainerd:masterfrom
crosbymichael:fifo-timeout

Conversation

@crosbymichael
Copy link
Copy Markdown
Member

There is still a special case where the client side fails to open or
load causes things to be slow and the shim can lock up when this
happens. This adds a timeout to the context for this case to abort fifo
creation.

Signed-off-by: Michael Crosby crosbymichael@gmail.com

There is still a special case where the client side fails to open or
load causes things to be slow and the shim can lock up when this
happens.  This adds a timeout to the context for this case to abort fifo
creation.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
@codecov-io
Copy link
Copy Markdown

codecov-io commented Dec 13, 2018

Codecov Report

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

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #2877   +/-   ##
=======================================
  Coverage   43.87%   43.87%           
=======================================
  Files         101      101           
  Lines       10796    10796           
=======================================
  Hits         4737     4737           
  Misses       5328     5328           
  Partials      731      731
Flag Coverage Δ
#linux 47.48% <ø> (ø) ⬆️
#windows 41.04% <ø> (ø) ⬆️

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 7fa2f41...a2a4241. 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

@lifubang
Copy link
Copy Markdown
Contributor

+1
Do you mind tell us where to find this special case?

@ehazlett
Copy link
Copy Markdown
Member

LGTM

@crosbymichael crosbymichael merged commit c3a5e25 into containerd:master Dec 14, 2018
@crosbymichael crosbymichael deleted the fifo-timeout branch December 14, 2018 18:13
Random-Liu added a commit to Random-Liu/gvisor-containerd-shim that referenced this pull request Jan 15, 2019
Signed-off-by: Lantao Liu <lantaol@google.com>
ianlewis pushed a commit to google/gvisor-containerd-shim that referenced this pull request Jan 15, 2019
Adds a timeout and cancel to shim fifo open
Signed-off-by: Lantao Liu <lantaol@google.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.

6 participants