Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hold shim lock during state #1965

Merged
merged 1 commit into from
Jan 5, 2018
Merged

Conversation

crosbymichael
Copy link
Member

Helps with #1935

This hold the shim lock during the state call to make sure that the task
does not get deleted during a state call.

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

Helps with containerd#1935

This hold the shim lock during the state call to make sure that the task
does not get deleted during a state call.

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

@mlaventure mlaventure 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

Codecov Report

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

Impacted file tree graph

@@          Coverage Diff           @@
##           master   #1965   +/-   ##
======================================
  Coverage    45.7%   45.7%           
======================================
  Files          94      94           
  Lines        9308    9308           
======================================
  Hits         4254    4254           
  Misses       4351    4351           
  Partials      703     703
Flag Coverage Δ
#linux 50.33% <ø> (ø) ⬆️
#windows 40.5% <ø> (ø) ⬆️

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 8b6909f...2b29a92. Read the comment docs.

Copy link
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 e892671 into containerd:master Jan 5, 2018
@stevvooe
Copy link
Member

stevvooe commented Jan 5, 2018

This will address #1935, in part.

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