Merge pull request #494 from hashicorp/b-dynamic-port-conflict

Remove shared reference to DynamicPorts across allocs

nomad/structs/network.go

@@ -95,11 +95,14 @@ func (idx *NetworkIndex) AddReserved(n *NetworkResource) (collide bool) {
 		used = make(map[int]struct{})
 		idx.UsedPorts[n.IP] = used
 	}
-	for _, port := range n.ReservedPorts {
+
-		if _, ok := used[port.Value]; ok {
+	for _, ports := range [][]Port{n.ReservedPorts, n.DynamicPorts} {
-			collide = true
+		for _, port := range ports {
-		} else {
+			if _, ok := used[port.Value]; ok {
-			used[port.Value] = struct{}{}
+				collide = true
+			} else {
+				used[port.Value] = struct{}{}
+			}
 		}
 	}
 
@@ -179,8 +182,11 @@ func (idx *NetworkIndex) AssignNetwork(ask *NetworkResource) (out *NetworkResour
 			if _, ok := idx.UsedPorts[ipStr][randPort]; ok {
 				goto PICK
 			}
-			if isPortReserved(offer.ReservedPorts, randPort) {
+
-				goto PICK
+			for _, ports := range [][]Port{offer.ReservedPorts, offer.DynamicPorts} {
+				if isPortReserved(ports, randPort) {
+					goto PICK
+				}
 			}
 			offer.DynamicPorts[i].Value = randPort
 		}

nomad/structs/structs.go

@@ -645,6 +645,10 @@ func (n *NetworkResource) Copy() *NetworkResource {
 		newR.ReservedPorts = make([]Port, len(n.ReservedPorts))
 		copy(newR.ReservedPorts, n.ReservedPorts)
 	}
+	if n.DynamicPorts != nil {
+		newR.DynamicPorts = make([]Port, len(n.DynamicPorts))
+		copy(newR.DynamicPorts, n.DynamicPorts)
+	}
 	return newR
 }
 

scheduler/generic_sched_test.go

@@ -60,6 +60,19 @@ func TestServiceSched_JobRegister(t *testing.T) {
 		t.Fatalf("bad: %#v", out)
 	}
 
+	// Ensure different ports were used.
+	used := make(map[int]struct{})
+	for _, alloc := range out {
+		for _, resource := range alloc.TaskResources {
+			for _, port := range resource.Networks[0].DynamicPorts {
+				if _, ok := used[port.Value]; ok {
+					t.Fatalf("Port collision %v", port.Value)
+				}
+				used[port.Value] = struct{}{}
+			}
+		}
+	}
+
 	h.AssertEvalStatus(t, structs.EvalStatusComplete)
 }