Merge pull request #3162 from s4ke/44378-moby-fix-constraint-enforcer-generic-resources

Fix HasResource inverted boolean error

Author: thaJeztah

api/genericresource/validate.go

@@ -63,7 +63,7 @@ func HasResource(res *api.GenericResource, resources []*api.GenericResource) boo
 				return false
 			}
 
-			if res.GetDiscreteResourceSpec().Value < rtype.DiscreteResourceSpec.Value {
+			if res.GetDiscreteResourceSpec().Value > rtype.DiscreteResourceSpec.Value {
 				return false
 			}
 

api/genericresource/validate_test.go

@@ -0,0 +1,29 @@
+package genericresource
+
+import (
+	"testing"
+
+	"github.com/moby/swarmkit/v2/api"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestHasResourceDiscreteMoreThanEnough(t *testing.T) {
+	required := NewDiscrete("apple", 1)
+	available := []*api.GenericResource{NewDiscrete("apple", 5)}
+
+	assert.True(t, HasResource(required, available))
+}
+
+func TestHasResourceDiscreteExactlyEnough(t *testing.T) {
+	required := NewDiscrete("apple", 5)
+	available := []*api.GenericResource{NewDiscrete("apple", 5)}
+
+	assert.True(t, HasResource(required, available))
+}
+
+func TestHasResourceDiscreteNotEnough(t *testing.T) {
+	required := NewDiscrete("apple", 6)
+	available := []*api.GenericResource{NewDiscrete("apple", 5)}
+
+	assert.False(t, HasResource(required, available))
+}

manager/orchestrator/constraintenforcer/constraint_enforcer_test.go

@@ -391,3 +391,128 @@ func TestGenericResourcesPlacementConstraints(t *testing.T) {
 	task = testutils.WatchTaskUpdate(t, watch)
 	assert.Equal(t, api.TaskStateRejected, task.Status.State)
 }
+
+func TestGenericResourcesPlacementConstraintsDiscrete(t *testing.T) {
+	node := &api.Node{
+		ID: "id0",
+		Spec: api.NodeSpec{
+			Annotations: api.Annotations{
+				Name: "node1",
+			},
+			Availability: api.NodeAvailabilityActive,
+		},
+		Status: api.NodeStatus{
+			State: api.NodeStatus_READY,
+		},
+		Role: api.NodeRoleWorker,
+		Description: &api.NodeDescription{
+			Resources: &api.Resources{
+				Generic: []*api.GenericResource{
+					genericresource.NewDiscrete("mygeneric", 2),
+				},
+			},
+		},
+		Attachments: []*api.NetworkAttachment{
+			{
+				Network: &api.Network{
+					ID: "id1",
+				},
+			},
+		},
+	}
+
+	service := &api.Service{
+		ID: "id1",
+		Spec: api.ServiceSpec{
+			Annotations: api.Annotations{
+				Name: "service1",
+			},
+			Task: api.TaskSpec{
+				Resources: &api.ResourceRequirements{
+					Reservations: &api.Resources{
+						Generic: []*api.GenericResource{
+							genericresource.NewDiscrete("mygeneric", 2),
+						},
+					},
+				},
+				Networks: []*api.NetworkAttachmentConfig{
+					{
+						Target: "id1",
+					},
+				},
+			},
+		},
+	}
+
+	task := &api.Task{
+		ID: "id2",
+		Spec: api.TaskSpec{
+			Resources: &api.ResourceRequirements{
+				Reservations: &api.Resources{
+					Generic: []*api.GenericResource{
+						genericresource.NewDiscrete("mygeneric", 2),
+					},
+				},
+			},
+			Networks: []*api.NetworkAttachmentConfig{
+				{
+					Target: "id1",
+				},
+			},
+		},
+		ServiceID: service.ID,
+		NodeID:    node.ID,
+		Status: api.TaskStatus{
+			State: api.TaskStateRunning,
+		},
+		DesiredState: api.TaskStateRunning,
+		AssignedGenericResources: []*api.GenericResource{
+			genericresource.NewDiscrete("mygeneric", 2),
+		},
+	}
+
+	s := store.NewMemoryStore(nil)
+	require.NotNil(t, s)
+	defer s.Close()
+
+	require.NoError(t, s.Update(func(tx store.Tx) error {
+		// Prepopulate node, service, and task.
+		for _, err := range []error{
+			store.CreateNode(tx, node),
+			store.CreateService(tx, service),
+			store.CreateTask(tx, task),
+		} {
+			if err != nil {
+				return err
+			}
+		}
+		return nil
+	}))
+
+	watch, cancel := state.Watch(s.WatchQueue(), api.EventUpdateTask{})
+	defer cancel()
+
+	constraintEnforcer := New(s)
+	defer constraintEnforcer.Stop()
+
+	// Update the node to remove the generic resource
+	require.NoError(t, s.Update(func(tx store.Tx) error {
+		node = store.GetNode(tx, node.ID)
+		node.Description = &api.NodeDescription{
+			Resources: &api.Resources{
+				Generic: []*api.GenericResource{
+					genericresource.NewDiscrete("mygeneric", 1),
+				},
+				NanoCPUs:    1e9,
+				MemoryBytes: 1e9,
+			},
+		}
+		return store.UpdateNode(tx, node)
+	}))
+
+	go constraintEnforcer.Run()
+
+	// The task should be rejected immediately.
+	task = testutils.WatchTaskUpdate(t, watch)
+	assert.Equal(t, api.TaskStateRejected, task.Status.State)
+}