Skip to content

manager/controlapi: reject named generic resource reservations #3300

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
breken-ai wants to merge 1 commit into
base: master
Choose a base branch
from
Open

manager/controlapi: reject named generic resource reservations #3300

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
2 changes: 1 addition & 1 deletion manager/controlapi/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ func validateResources(r *api.Resources) error {
return status.Errorf(codes.InvalidArgument, "invalid memory value %d: Must be at least 4MiB", r.MemoryBytes)
}
if err := genericresource.ValidateTask(r); err != nil {
return nil
return status.Error(codes.InvalidArgument, err.Error())
}
return nil
}
Expand Down
5 changes: 5 additions & 0 deletions manager/controlapi/service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (

gogotypes "github.com/gogo/protobuf/types"
"github.com/moby/swarmkit/v2/api"
"github.com/moby/swarmkit/v2/api/genericresource"
"github.com/moby/swarmkit/v2/identity"
"github.com/moby/swarmkit/v2/manager/state/store"
"github.com/moby/swarmkit/v2/testutils"
Expand Down Expand Up @@ -174,11 +175,14 @@ func TestValidateResources(t *testing.T) {
bad := []*api.Resources{
{MemoryBytes: 1},
{NanoCPUs: 42},
// tasks can only request discrete generic resources
{Generic: genericresource.NewSet("gpu", "UUID1")},
}

good := []*api.Resources{
{MemoryBytes: 4096 * 1024 * 1024},
{NanoCPUs: 1e9},
{Generic: []*api.GenericResource{genericresource.NewDiscrete("gpu", 2)}},
}

for _, b := range bad {
Expand All @@ -196,6 +200,7 @@ func TestValidateResourceRequirements(t *testing.T) {
bad := []*api.ResourceRequirements{
{Limits: &api.Resources{MemoryBytes: 1}},
{Reservations: &api.Resources{MemoryBytes: 1}},
{Reservations: &api.Resources{Generic: genericresource.NewSet("gpu", "UUID1")}},
}
good := []*api.ResourceRequirements{
{Limits: &api.Resources{NanoCPUs: 1e9}},
Expand Down