Skip to content

update: fix --cpus writing cpuset instead of quota/period #5067

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.

Sign up for GitHub

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

Open
kmaris wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −5
Open

update: fix --cpus writing cpuset instead of quota/period #5067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions cmd/nerdctl/container/container_update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,10 +295,9 @@ func updateContainer(ctx context.Context, client *containerd.Client, id string,
spec.Linux.Resources.CPU.Period = &opts.CPUPeriod
}
}
if cmd.Flags().Changed("cpus") {
if spec.Linux.Resources.CPU.Cpus != opts.CpusetCpus {
spec.Linux.Resources.CPU.Cpus = opts.CpusetCpus
}
if cmd.Flags().Changed("cpus") && opts.CPUQuota != -1 && opts.CPUPeriod != 0 {
spec.Linux.Resources.CPU.Quota = &opts.CPUQuota
spec.Linux.Resources.CPU.Period = &opts.CPUPeriod
}
if cmd.Flags().Changed("cpuset-mems") {
if spec.Linux.Resources.CPU.Mems != opts.CpusetMems {
Expand Down
14 changes: 13 additions & 1 deletion cmd/nerdctl/container/container_update_linux_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ import (

func TestUpdateContainer(t *testing.T) {
testCase := nerdtest.Setup()
testCase.Require = require.Not(nerdtest.Docker)

testCase.Setup = func(data test.Data, helpers test.Helpers) {
containerName := testutil.Identifier(t)
Expand All @@ -48,6 +47,7 @@ func TestUpdateContainer(t *testing.T) {
{
Description: "should fail on unsupported restart policy value",
NoParallel: true,
Require: require.Not(nerdtest.Docker),
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
containerName := data.Labels().Get("containerName")
return helpers.Command("update", "--memory", "999999999", "--restart", "123", containerName)
Expand All @@ -57,12 +57,24 @@ func TestUpdateContainer(t *testing.T) {
{
Description: "should not update memory in inspect",
NoParallel: true,
Require: require.Not(nerdtest.Docker),
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
containerName := data.Labels().Get("containerName")
return helpers.Command("inspect", "--mode=native", containerName)
},
Expected: test.Expects(expect.ExitCodeSuccess, nil, expect.DoesNotContain(`"limit": 999999999,`)),
},
{
Description: "should persist the quota and period converted from --cpus",
NoParallel: true,
Require: nerdtest.CGroupV2,
Command: func(data test.Data, helpers test.Helpers) test.TestableCommand {
containerName := data.Labels().Get("containerName")
helpers.Ensure("update", "--cpus", "0.5", containerName)
return helpers.Command("exec", containerName, "cat", "/sys/fs/cgroup/cpu.max")
},
Expected: test.Expects(expect.ExitCodeSuccess, nil, expect.Contains("50000 100000")),
},
}

testCase.Run(t)
Expand Down
Loading