cgroups: fix incorrect cgroups cpuset via systemd #2230
Conversation
|
Ephemeral COPR build failed. @containers/packit-build please check. |
pkg/cgroups/systemd_linux.go
Outdated
| @@ -260,3 +262,35 @@ func resourcesToProps(res *configs.Resources, v2 bool) (map[string]uint64, map[s | |||
|
|
|||
| return uMap, sMap, bMap, iMap, structMap | |||
| } | |||
|
|
|||
| func RangeToBits(str string) ([]byte) { | |||
There was a problem hiding this comment.
since it is used only here, can we make it private (rangeToBits)?
There was a problem hiding this comment.
I made it to private (rangeToBits).
pkg/cgroups/systemd_linux.go
Outdated
| start, _ := strconv.ParseUint(startr, 10, 32) | ||
| end, _ := strconv.ParseUint(endr, 10, 32) |
There was a problem hiding this comment.
please propagate these errors, if they happen
There was a problem hiding this comment.
I added error handling. However, in Podman, values are checked in advance, so no errors occur.
I also added a test to check the value of the converted cpuset.
pkg/cgroups/systemd_linux.go
Outdated
| bits.SetBit(bits, int(i), 1) | ||
| } | ||
| } else { | ||
| val, _ := strconv.ParseUint(startr, 10, 32) |
There was a problem hiding this comment.
I added error handling.
mmmmaeda
force-pushed
the
fix-cgroup-cpuset
branch
2 times, most recently
from
4406064
to
9b32d3e
Compare
pkg/cgroups/systemd_linux.go
Outdated
| // fit cpuset parsing order in systemd | ||
| for l, r := 0, len(ret)-1; l < r; l, r = l+1, r-1 { | ||
| ret[l], ret[r] = ret[r], ret[l] | ||
| } |
There was a problem hiding this comment.
This is reversing the slice I assume? Please use slices.Reverse() instead
There was a problem hiding this comment.
I've used slices.Reverse().
pkg/cgroups/systemd_linux.go
Outdated
| uMap, sMap, bMap, iMap, structMap, res_err := resourcesToProps(resources, v2) | ||
| if res_err != nil { | ||
| return res_err | ||
| } |
There was a problem hiding this comment.
the error var should be called err
There was a problem hiding this comment.
the error var changed to err.
Signed-off-by: Yuta Maeda <[email protected]> Signed-off-by: Tatsuya Ono <[email protected]>
ttyono
force-pushed
the
fix-cgroup-cpuset
branch
from
9b32d3e
to
d63a212
Compare
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: Luap99, mmmmaeda The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/lgtm |
The cpuset value setting for cgroup is not set correctly.
Fixes #2229