Skip to content

[release/1.2 backport] runtime/v1/linux/proc/io: io race#3154

Merged
crosbymichael merged 2 commits intocontainerd:release/1.2from
thaJeztah:1.2_backport_issue_3118
Apr 1, 2019
Merged

[release/1.2 backport] runtime/v1/linux/proc/io: io race#3154
crosbymichael merged 2 commits intocontainerd:release/1.2from
thaJeztah:1.2_backport_issue_3118

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

Backport of for the release/1.2 branch

first commit didn't apply clean due to #3085 not being in the 1.2 branch

Signed-off-by: Peter Wagner <[email protected]>
(cherry picked from commit e96ac20)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Peter Wagner <[email protected]>
(cherry picked from commit ae04c16)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@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

@codecov-io
Copy link
Copy Markdown

codecov-io commented Apr 1, 2019

Codecov Report

Merging #3154 into release/1.2 will decrease coverage by 3.63%.
The diff coverage is n/a.

Impacted file tree graph

@@               Coverage Diff               @@
##           release/1.2    #3154      +/-   ##
===============================================
- Coverage        47.39%   43.76%   -3.64%     
===============================================
  Files               92      101       +9     
  Lines             8403    10738    +2335     
===============================================
+ Hits              3983     4699     +716     
- Misses            3696     5309    +1613     
- Partials           724      730       +6
Flag Coverage Δ
#linux 47.39% <ø> (ø) ⬆️
#windows 40.85% <ø> (?)
Impacted Files Coverage Δ
snapshots/native/native.go 43.3% <0%> (-10%) ⬇️
metadata/snapshot.go 45.8% <0%> (-8.96%) ⬇️
archive/tar.go 43.79% <0%> (-7.07%) ⬇️
metadata/containers.go 47.97% <0%> (-6.62%) ⬇️
content/local/writer.go 57.84% <0%> (-6.36%) ⬇️
content/local/store.go 48.51% <0%> (-5.03%) ⬇️
remotes/docker/resolver.go 58.36% <0%> (-4.99%) ⬇️
archive/tar_opts.go 28.57% <0%> (-4.77%) ⬇️
archive/compression/compression.go 58.69% <0%> (-4.7%) ⬇️
metadata/images.go 58.46% <0%> (-4.7%) ⬇️
... and 57 more

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 5066e51...76d1f3e. Read the comment docs.

@crosbymichael crosbymichael merged commit 0d58ce1 into containerd:release/1.2 Apr 1, 2019
@thaJeztah thaJeztah mentioned this pull request Apr 1, 2019
2 tasks
@thaJeztah thaJeztah deleted the 1.2_backport_issue_3118 branch April 1, 2019 21:14
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