Skip to content

[release/1.1 backport] runtime/v1/linux/proc/io: io race#3156

Merged
dmcgowan merged 2 commits intocontainerd:release/1.1from
thaJeztah:1.1_backport_issue_3118
Apr 1, 2019
Merged

[release/1.1 backport] runtime/v1/linux/proc/io: io race#3156
dmcgowan merged 2 commits intocontainerd:release/1.1from
thaJeztah:1.1_backport_issue_3118

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

backport of #3153 for the 1.1 branch

This code moved around between 1.1 and 1.2 (with the introduction of the V2 runtime), so I applied the patch manually;

git format-patch --relative HEAD~ 
git checkout -b 1.1_backport_issue_3118 upstream/release/1.1 
git am -p3 --reject 0001-runtime-log-IO-error-when-copying-output-streams.patch
git am -p3 --reject 0002-runtime-guard-Close-until-both-streams-are-complete.patch

Signed-off-by: Peter Wagner <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Peter Wagner <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah mentioned this pull request Apr 1, 2019
2 tasks
@thaJeztah
Copy link
Copy Markdown
Member Author

hm... CI is not triggered on this PR for some reason

@crosbymichael
Copy link
Copy Markdown
Member

LGTM

@thaJeztah
Copy link
Copy Markdown
Member Author

thaJeztah commented Apr 1, 2019

I'll rebase/push again once #3157 is merged to have CI run 👍

edit: never mind, looks like it just took a bit; it's running now 😅

@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #3156 into release/1.1 will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##           release/1.1    #3156   +/-   ##
============================================
  Coverage        49.07%   49.07%           
============================================
  Files               85       85           
  Lines             7598     7598           
============================================
  Hits              3729     3729           
  Misses            3194     3194           
  Partials           675      675
Flag Coverage Δ
#linux 49.07% <ø> (ø) ⬆️

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 2bf4d3a...de85314. Read the comment docs.

@dmcgowan
Copy link
Copy Markdown
Member

dmcgowan commented Apr 1, 2019

LGTM

@dmcgowan dmcgowan merged commit 01cd85f into containerd:release/1.1 Apr 1, 2019
@thaJeztah thaJeztah deleted the 1.1_backport_issue_3118 branch April 1, 2019 22:20
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