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

Add lock around task cgroup #1795

Merged
merged 1 commit into from Nov 22, 2017
Merged

Conversation

crosbymichael
Copy link
Member

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

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

Codecov Report

Merging #1795 into master will decrease coverage by 0.05%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1795      +/-   ##
==========================================
- Coverage   49.38%   49.33%   -0.06%     
==========================================
  Files          77       77              
  Lines        7692     7692              
==========================================
- Hits         3799     3795       -4     
- Misses       3248     3252       +4     
  Partials      645      645
Flag Coverage Δ
#linux 49.4% <ø> (-0.06%) ⬇️
#windows 44.89% <ø> (ø) ⬆️
Impacted Files Coverage Δ
metadata/content.go 31.05% <0%> (-0.95%) ⬇️

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 1a6e6a9...e830112. Read the comment docs.

hasCgroup := t.cg != nil
t.mu.Unlock()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we defer this one? This will allow the other calls to be successful once the task has started

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the monitor call would produce a deadlock in that method

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

@stevvooe
Copy link
Member

LGTM

@stevvooe stevvooe merged commit 8e09b56 into containerd:master Nov 22, 2017
@crosbymichael crosbymichael deleted the cgroup-lock branch November 22, 2017 20:09
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.

None yet

4 participants