Skip to content

[release/1.0] linux/prox: timeout fifo creation#2232

Merged
dmcgowan merged 1 commit intocontainerd:release/1.0from
stevvooe:cherry-pick-#2229
Mar 26, 2018
Merged

[release/1.0] linux/prox: timeout fifo creation#2232
dmcgowan merged 1 commit intocontainerd:release/1.0from
stevvooe:cherry-pick-#2229

Conversation

@stevvooe
Copy link
Copy Markdown
Member

@stevvooe stevvooe commented Mar 26, 2018

Under certain conditions in the client, the fifo for a container may not
be created. A timeout has been added to this operation to ensure the
shim can recover when the client fails to open the fifos.

Signed-off-by: Stephen J Day [email protected]
(cherry picked from commit 9754696)
Signed-off-by: Stephen J Day [email protected]

Cherry pick of #2229 into release/1.0

Under certain conditions in the client, the fifo for a container may not
be created. A timeout has been added to this operation to ensure the
shim can recover when the client fails to open the fifos.

Signed-off-by: Stephen J Day <[email protected]>
(cherry picked from commit 9754696)
Signed-off-by: Stephen J Day <[email protected]>
@stevvooe stevvooe added this to the 1.0.3 milestone Mar 26, 2018
@stevvooe stevvooe changed the title linux/prox: timeout fifo creation [release/1.0] linux/prox: timeout fifo creation Mar 26, 2018
@crosbymichael
Copy link
Copy Markdown
Member

LGTM

@codecov-io
Copy link
Copy Markdown

Codecov Report

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

Impacted file tree graph

@@             Coverage Diff              @@
##           release/1.0    #2232   +/-   ##
============================================
  Coverage        50.55%   50.55%           
============================================
  Files               81       81           
  Lines             7176     7176           
============================================
  Hits              3628     3628           
  Misses            2853     2853           
  Partials           695      695
Flag Coverage Δ
#linux 50.55% <ø> (ø) ⬆️

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 a609ec4...d235ae9. Read the comment docs.

@dmcgowan
Copy link
Copy Markdown
Member

LGTM

@dmcgowan dmcgowan merged commit 21e89eb into containerd:release/1.0 Mar 26, 2018
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