Skip to content

Conversation

@kunalkushwaha
Copy link
Contributor

Signed-off-by: Kunal Kushwaha [email protected]

Signed-off-by: Kunal Kushwaha <[email protected]>
@kunalkushwaha
Copy link
Contributor Author

fixes #62 #61

@crosbymichael
Copy link
Member

LGTM

crosbymichael added a commit that referenced this pull request Jan 4, 2016
@crosbymichael crosbymichael merged commit ee4d203 into containerd:master Jan 4, 2016
crosbymichael added a commit to crosbymichael/containerd that referenced this pull request Dec 10, 2018
```
1152b96 (HEAD -> master, origin/master)
Merge pull request containerd#73 from gliptak/gofmt1
afd5981 Gofmt cgroup_test
65ce98b Merge pull request containerd#69 from
cclerget/master-weight-pointer
0f372c6 Merge pull request containerd#71 from
JoeWrightss/patch-1
f48bd85 Fixs return error message
10cd53e Merge pull request containerd#70 from
gliptak/patch-1
64bade4 Take value instead of pointer
value
b49c471 Correct ineffassign warning
3bc6dde Merge pull request containerd#68 from
cclerget/master-net_prio-typo
6b552a8 Fix net_prio typo
c0437c3 Merge pull request containerd#67 from
gpanouts/get-all-cgroup-tasks
a31a0ff Add functionality for
retrieving all tasks of a cgroup
82cb49f Merge pull request containerd#63 from
ChrsMark/lenient-subsystems-checking
7d825b2 Add test for cgroups load when
missing hierarchy in one subsystem
f6cbfb4 Change Load function in order
to be more lenient on subsystems' checking
965bb1d Merge pull request containerd#66 from
crosbymichael/systemdci
ab9ec0e (fork/systemdci, systemdci) Add
go-systemd dep for CI testing
0e94a83 Merge pull request containerd#59 from
gliptak/patch-1
4479d11 Merge pull request containerd#62 from
estesp/fix-gofmt
9beb998 Merge pull request containerd#61 from
gliptak/patch-3
9a09e58 Fix gofmt of systemd.go
84e6e6e Merge pull request containerd#60 from
gliptak/patch-2
e13f6cc Add GoReportCard badge to
README
d124595 Add Go 1.11 to Travis
d961ab9 Correct typo
d240072 Merge pull request containerd#57 from
estesp/project-update
e4cf832 Add project references and use
common project travis
8baeff6 Merge pull request containerd#56 from
grantseltzer/patch-1
9de57ff Add godoc badge to README.md
5017d4e Merge pull request containerd#54 from
WeiZhang555/bugfix
13aaafd Bugfix: can't write to cpuset
cgroup
58556f5 Merge pull request containerd#53 from
baude/systemdslicedelegate
15ed73c systemd-239+ no longer allows
delegate slice
3024bc7 Merge pull request containerd#52 from
Sykomaniac/bugfix/slice-name
2596f33 Remove call to unitName
2e2922e Merge pull request containerd#51 from
containerd/type
0f3de2f (type) Fix empty device type
```

Signed-off-by: Michael Crosby <[email protected]>
robertgzr pushed a commit to balena-os/balena-containerd that referenced this pull request Mar 4, 2019
```
1152b96 (HEAD -> master, origin/master)
Merge pull request containerd#73 from gliptak/gofmt1
afd5981 Gofmt cgroup_test
65ce98b Merge pull request containerd#69 from
cclerget/master-weight-pointer
0f372c6 Merge pull request containerd#71 from
JoeWrightss/patch-1
f48bd85 Fixs return error message
10cd53e Merge pull request containerd#70 from
gliptak/patch-1
64bade4 Take value instead of pointer
value
b49c471 Correct ineffassign warning
3bc6dde Merge pull request containerd#68 from
cclerget/master-net_prio-typo
6b552a8 Fix net_prio typo
c0437c3 Merge pull request containerd#67 from
gpanouts/get-all-cgroup-tasks
a31a0ff Add functionality for
retrieving all tasks of a cgroup
82cb49f Merge pull request containerd#63 from
ChrsMark/lenient-subsystems-checking
7d825b2 Add test for cgroups load when
missing hierarchy in one subsystem
f6cbfb4 Change Load function in order
to be more lenient on subsystems' checking
965bb1d Merge pull request containerd#66 from
crosbymichael/systemdci
ab9ec0e (fork/systemdci, systemdci) Add
go-systemd dep for CI testing
0e94a83 Merge pull request containerd#59 from
gliptak/patch-1
4479d11 Merge pull request containerd#62 from
estesp/fix-gofmt
9beb998 Merge pull request containerd#61 from
gliptak/patch-3
9a09e58 Fix gofmt of systemd.go
84e6e6e Merge pull request containerd#60 from
gliptak/patch-2
e13f6cc Add GoReportCard badge to
README
d124595 Add Go 1.11 to Travis
d961ab9 Correct typo
d240072 Merge pull request containerd#57 from
estesp/project-update
e4cf832 Add project references and use
common project travis
8baeff6 Merge pull request containerd#56 from
grantseltzer/patch-1
9de57ff Add godoc badge to README.md
5017d4e Merge pull request containerd#54 from
WeiZhang555/bugfix
13aaafd Bugfix: can't write to cpuset
cgroup
58556f5 Merge pull request containerd#53 from
baude/systemdslicedelegate
15ed73c systemd-239+ no longer allows
delegate slice
3024bc7 Merge pull request containerd#52 from
Sykomaniac/bugfix/slice-name
2596f33 Remove call to unitName
2e2922e Merge pull request containerd#51 from
containerd/type
0f3de2f (type) Fix empty device type
```

Signed-off-by: Michael Crosby <[email protected]>
thaJeztah added a commit to thaJeztah/docker that referenced this pull request Mar 13, 2019
Relevant changes:

- containerd/containerd#51 Fix empty device type
- containerd/containerd#52 Remove call to unitName
  - Calling unitName incorrectly appends -slice onto the end of the slice cgroup we are looking for
  - addresses containerd/containerd#47 cgroups: cgroup deleted
- containerd/containerd#53 systemd-239+ no longer allows delegate slice
- containerd/containerd#54 Bugfix: can't write to cpuset cgroup
- containerd/containerd#63 Makes Load function more lenient on subsystems' checking
  - addresses containerd/containerd#58 Very strict checking of subsystems' existence while loading cgroup
- containerd/containerd#67 Add functionality for retrieving all tasks of a cgroup
- containerd/containerd#68 Fix net_prio typo
- containerd/containerd#69 Blkio weight/leafWeight pointer value
- containerd/containerd#77 Check for non-active/supported cgroups
  - addresses containerd/containerd#76 unable to find * in controller set: unknown
  - addresses docker/for-linux#545 Raspbian: Error response from daemon: unable to find "net_prio" in controller set: unknown
  - addresses docker/for-linux#552 Error response from daemon: unable to find "cpuacct" in controller set: unknown
  - addresses docker/for-linux#545 Raspbian: Error response from daemon: unable to find "net_prio" in controller set: unknown

Signed-off-by: Sebastiaan van Stijn <[email protected]>
docker-jenkins pushed a commit to docker-archive/docker-ce that referenced this pull request Mar 15, 2019
Relevant changes:

- containerd/containerd#51 Fix empty device type
- containerd/containerd#52 Remove call to unitName
  - Calling unitName incorrectly appends -slice onto the end of the slice cgroup we are looking for
  - addresses containerd/containerd#47 cgroups: cgroup deleted
- containerd/containerd#53 systemd-239+ no longer allows delegate slice
- containerd/containerd#54 Bugfix: can't write to cpuset cgroup
- containerd/containerd#63 Makes Load function more lenient on subsystems' checking
  - addresses containerd/containerd#58 Very strict checking of subsystems' existence while loading cgroup
- containerd/containerd#67 Add functionality for retrieving all tasks of a cgroup
- containerd/containerd#68 Fix net_prio typo
- containerd/containerd#69 Blkio weight/leafWeight pointer value
- containerd/containerd#77 Check for non-active/supported cgroups
  - addresses containerd/containerd#76 unable to find * in controller set: unknown
  - addresses docker/for-linux#545 Raspbian: Error response from daemon: unable to find "net_prio" in controller set: unknown
  - addresses docker/for-linux#552 Error response from daemon: unable to find "cpuacct" in controller set: unknown
  - addresses docker/for-linux#545 Raspbian: Error response from daemon: unable to find "net_prio" in controller set: unknown

Signed-off-by: Sebastiaan van Stijn <[email protected]>
Upstream-commit: 386b06eacd689bb98fb4117087614466c6e130f3
Component: engine
thaJeztah added a commit to thaJeztah/docker that referenced this pull request Mar 15, 2019
Relevant changes:

- containerd/containerd#51 Fix empty device type
- containerd/containerd#52 Remove call to unitName
  - Calling unitName incorrectly appends -slice onto the end of the slice cgroup we are looking for
  - addresses containerd/containerd#47 cgroups: cgroup deleted
- containerd/containerd#53 systemd-239+ no longer allows delegate slice
- containerd/containerd#54 Bugfix: can't write to cpuset cgroup
- containerd/containerd#63 Makes Load function more lenient on subsystems' checking
  - addresses containerd/containerd#58 Very strict checking of subsystems' existence while loading cgroup
- containerd/containerd#67 Add functionality for retrieving all tasks of a cgroup
- containerd/containerd#68 Fix net_prio typo
- containerd/containerd#69 Blkio weight/leafWeight pointer value
- containerd/containerd#77 Check for non-active/supported cgroups
  - addresses containerd/containerd#76 unable to find * in controller set: unknown
  - addresses docker/for-linux#545 Raspbian: Error response from daemon: unable to find "net_prio" in controller set: unknown
  - addresses docker/for-linux#552 Error response from daemon: unable to find "cpuacct" in controller set: unknown
  - addresses docker/for-linux#545 Raspbian: Error response from daemon: unable to find "net_prio" in controller set: unknown

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 386b06e)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
docker-jenkins pushed a commit to docker-archive/docker-ce that referenced this pull request Mar 20, 2019
Relevant changes:

- containerd/containerd#51 Fix empty device type
- containerd/containerd#52 Remove call to unitName
  - Calling unitName incorrectly appends -slice onto the end of the slice cgroup we are looking for
  - addresses containerd/containerd#47 cgroups: cgroup deleted
- containerd/containerd#53 systemd-239+ no longer allows delegate slice
- containerd/containerd#54 Bugfix: can't write to cpuset cgroup
- containerd/containerd#63 Makes Load function more lenient on subsystems' checking
  - addresses containerd/containerd#58 Very strict checking of subsystems' existence while loading cgroup
- containerd/containerd#67 Add functionality for retrieving all tasks of a cgroup
- containerd/containerd#68 Fix net_prio typo
- containerd/containerd#69 Blkio weight/leafWeight pointer value
- containerd/containerd#77 Check for non-active/supported cgroups
  - addresses containerd/containerd#76 unable to find * in controller set: unknown
  - addresses docker/for-linux#545 Raspbian: Error response from daemon: unable to find "net_prio" in controller set: unknown
  - addresses docker/for-linux#552 Error response from daemon: unable to find "cpuacct" in controller set: unknown
  - addresses docker/for-linux#545 Raspbian: Error response from daemon: unable to find "net_prio" in controller set: unknown

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 386b06eacd689bb98fb4117087614466c6e130f3)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Upstream-commit: a36f6bfc36d2425c693097102b91152fa8f80012
Component: engine
adi-dhulipala pushed a commit to adi-dhulipala/docker that referenced this pull request Apr 11, 2019
Relevant changes:

- containerd/containerd#51 Fix empty device type
- containerd/containerd#52 Remove call to unitName
  - Calling unitName incorrectly appends -slice onto the end of the slice cgroup we are looking for
  - addresses containerd/containerd#47 cgroups: cgroup deleted
- containerd/containerd#53 systemd-239+ no longer allows delegate slice
- containerd/containerd#54 Bugfix: can't write to cpuset cgroup
- containerd/containerd#63 Makes Load function more lenient on subsystems' checking
  - addresses containerd/containerd#58 Very strict checking of subsystems' existence while loading cgroup
- containerd/containerd#67 Add functionality for retrieving all tasks of a cgroup
- containerd/containerd#68 Fix net_prio typo
- containerd/containerd#69 Blkio weight/leafWeight pointer value
- containerd/containerd#77 Check for non-active/supported cgroups
  - addresses containerd/containerd#76 unable to find * in controller set: unknown
  - addresses docker/for-linux#545 Raspbian: Error response from daemon: unable to find "net_prio" in controller set: unknown
  - addresses docker/for-linux#552 Error response from daemon: unable to find "cpuacct" in controller set: unknown
  - addresses docker/for-linux#545 Raspbian: Error response from daemon: unable to find "net_prio" in controller set: unknown

Signed-off-by: Sebastiaan van Stijn <[email protected]>
jepio pushed a commit to jepio/containerd that referenced this pull request Dec 3, 2021
…cking

Makes Load function more lenient on subsystems' checking
jseba pushed a commit to jseba/containerd that referenced this pull request Aug 25, 2023
Mark package as "providing", "conflicting" and "obsoletes" runc
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.

3 participants