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

Remove call to unitName #52

Merged
merged 1 commit into from Aug 20, 2018
Merged

Remove call to unitName #52

merged 1 commit into from Aug 20, 2018

Conversation

ghost
Copy link

@ghost ghost commented Aug 16, 2018

  • Calling unitName incorrectly appends -slice onto the end of the slice cgroup we are looking for
  • Tested and can't see any obvious side effects by removing this call
  • Fixes cgroups: cgroup deleted #47

@ghost
Copy link
Author

ghost commented Aug 16, 2018

Tested this and it works as expected. My test code worked as follows:

control, err := cgroups.Load(cgroups.SingleSubsystem(cgroups.Systemd, cgroups.Pids), cgroups.Slice("system.slice", "docker.service"))

@crosbymichael
Copy link
Member

Can you sign your commit with the DCO? git commit -s --amend?

https://github.com/containerd/containerd/blob/master/CONTRIBUTING.md#sign-your-work

Thanks for working on this!

@codecov-io
Copy link

codecov-io commented Aug 16, 2018

Codecov Report

Merging #52 into master will not change coverage.
The diff coverage is 0%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master      #52   +/-   ##
=======================================
  Coverage   13.32%   13.32%           
=======================================
  Files          23       23           
  Lines        4518     4518           
=======================================
  Hits          602      602           
  Misses       3800     3800           
  Partials      116      116
Impacted Files Coverage Δ
systemd.go 0% <0%> (ø) ⬆️

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 2e2922e...2596f33. Read the comment docs.

@ghost
Copy link
Author

ghost commented Aug 16, 2018

@crosbymichael Think I have done this - although I ended up with 3 commits for 1 tiny change :(

@crosbymichael
Copy link
Member

@Sykomaniac if you amend and force push it should be one. you can git rebase -i HEAD~3 and squash

- Calling unitName incorrectly appends -slice onto the end of the slice cgroup we are looking for
- Tested and can'r see any obvious side effects by removing this call

Signed-off-by: Ashley Sykes ashleysykes01@gmail.com
@ghost
Copy link
Author

ghost commented Aug 16, 2018

@crosbymichael Force push done - now only one commit

@crosbymichael
Copy link
Member

LGTM

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

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

3 participants