use same NodeMaxAllocs struct for client and node config

Author: tehut

client/client.go

@@ -1629,12 +1629,8 @@ func (c *Client) setupNode() error {
 		node.Meta[envoy.DefaultTransparentProxyOutboundPortParam] = envoy.DefaultTransparentProxyOutboundPort
 	}
 	// Set NodeMaxAllocs before dynamic configuration is set
-	if node.NodeAllocationTracker == nil {
-		if newConfig.NodeMaxAllocs >= 1 {
-			node.NodeAllocationTracker = &structs.NodeAllocationTracker{
-				NodeMaxAllocs: newConfig.NodeMaxAllocs,
-			}
-		}
+	if node.NodeMaxAllocs == nil && newConfig.NodeMaxAllocs != nil {
+		node.NodeMaxAllocs = newConfig.NodeMaxAllocs
 	}
 	// Since node.Meta will get dynamic metadata merged in, save static metadata
 	// here.

client/config/config.go

@@ -378,7 +378,7 @@ type Config struct {
 
 	// NodeMaxAllocs is an optional field that sets the maximum number of
 	// allocations a node can be assigned. Defaults to 0 and ignored if unset.
-	NodeMaxAllocs int
+	NodeMaxAllocs *structs.NodeMaxAllocs
 }
 
 type APIListenerRegistrar interface {

nomad/structs/funcs.go

@@ -141,8 +141,8 @@ func (a TerminalByNodeByName) Get(nodeID, name string) (*Allocation, bool) {
 func AllocsFit(node *Node, allocs []*Allocation, netIdx *NetworkIndex, checkDevices bool) (bool, string, *ComparableResources, error) {
 	// Compute the allocs' utilization from zero
 	used := new(ComparableResources)
-	if node.NodeAllocationTracker != nil {
-		if node.NodeAllocationTracker.NodeMaxAllocs < len(allocs) {
+	if node.NodeMaxAllocs != nil {
+		if node.NodeMaxAllocs.MaxAllocs < len(allocs) {
 			return false, "max allocation exceeded", used, fmt.Errorf("plan exceeds max allocation")
 		}
 	}

nomad/structs/funcs_test.go

@@ -774,7 +774,7 @@ func TestAllocsFit_MaxNodeAllocs(t *testing.T) {
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
 			n := node2k()
-			n.NodeAllocationTracker = &NodeAllocationTracker{false, tc.maxAllocs}
+			n.NodeMaxAllocs = &NodeMaxAllocs{tc.maxAllocs}
 			fit, dim, used, err := AllocsFit(n, tc.allocations, nil, false)
 			if !tc.expectErr {
 				must.NoError(t, err)

nomad/structs/structs.go

@@ -2175,10 +2175,10 @@ type Node struct {
 	CreateIndex uint64
 	ModifyIndex uint64
 
-	// NodeAllocationTracker holds NodeMaxAllocs value, if configured,
+	// NodeMaxAllocs holds NodeMaxAllocs value, if configured,
 	// and CurrentNodeAllocations to help the scheduler to block excess
 	// allocations.
-	NodeAllocationTracker *NodeAllocationTracker
+	NodeMaxAllocs *NodeMaxAllocs
 }
 
 // GetID is a helper for getting the ID when the object may be nil and is
@@ -2399,10 +2399,10 @@ type NodeStubFields struct {
 	OS        bool
 }
 
-// NodeAllocationTracker holds the NodeMaxAlloc value
+// NodeMaxAllocs holds the NodeMaxAlloc value
 // if set in *client.Config.
-type NodeAllocationTracker struct {
-	NodeMaxAllocs int
+type NodeMaxAllocs struct {
+	MaxAllocs int
 }
 
 // Resources is used to define the resources available

scheduler/rank_test.go

@@ -2160,14 +2160,14 @@ func TestBinPackIterator_MaxAlloc(t *testing.T) {
 			if tc.noNodes {
 				// Note: test case order matters here
 				for _, v := range nodes {
-					v.Node.NodeAllocationTracker = &structs.NodeAllocationTracker{
-						NodeMaxAllocs: tc.maxAlloc,
+					v.Node.NodeMaxAllocs = &structs.NodeMaxAllocs{
+						MaxAllocs: tc.maxAlloc,
 					}
 				}
 			} else {
 				// only add allocation limit to first node if !noNodes
-				nodes[0].Node.NodeAllocationTracker = &structs.NodeAllocationTracker{
-					NodeMaxAllocs: tc.maxAlloc,
+				nodes[0].Node.NodeMaxAllocs = &structs.NodeMaxAllocs{
+					MaxAllocs: tc.maxAlloc,
 				}
 			}
 			static := NewStaticRankIterator(ctx, nodes)