Merge 96e5ab1 into backport/pfnr-networking-fix/ultimately-just-shrew

hashicorp · Mar 9, 2023 · 58c0c21 · 58c0c21
2 parents 1560f16 + 96e5ab1
commit 58c0c21
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/nomad/structs/bitmap.go b/nomad/structs/bitmap.go
@@ -88,7 +88,7 @@ func (b Bitmap) IndexesInRangeFiltered(set bool, from, to uint, filter []int) []
 	var indexes []int
 	for i := from; i <= to && i < b.Size(); i++ {
 		c := b.Check(i)
-		if c && set || !c && !set {
+		if c == set {
 			if len(filter) < 1 || !slices.Contains(filter, int(i)) {
 				indexes = append(indexes, int(i))
 			}

diff --git a/nomad/structs/network.go b/nomad/structs/network.go
@@ -758,7 +758,7 @@ func getDynamicPortsStochastic(nodeUsed Bitmap, portsInOffer []int, minDynamicPo
 		}
 		// the pick conflicted with a previous pick that hasn't been saved to
 		// the index yet
-		if portsInOffer != nil && slices.Contains(portsInOffer, randPort) {
+		if slices.Contains(portsInOffer, randPort) {
 			goto PICK
 		}