state: fix eval list by prefix with * namespace (#13551)

hashicorp · Jul 7, 2022 · d9a0d64 · d9a0d64
1 parent 52389ff
commit d9a0d64
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/.changelog/13551.txt b/.changelog/13551.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+state: Fix listing evaluations from all namespaces
+```
diff --git a/nomad/state/state_store.go b/nomad/state/state_store.go
@@ -3294,7 +3294,8 @@ func evalNamespaceFilter(namespace string) func(interface{}) bool {
 			return true
 		}
 
-		return eval.Namespace != namespace
+		return namespace != structs.AllNamespacesSentinel &&
+			eval.Namespace != namespace
 	}
 }
 

diff --git a/nomad/state/state_store_test.go b/nomad/state/state_store_test.go
@@ -4636,11 +4636,15 @@ func TestStateStore_EvalsByIDPrefix_Namespaces(t *testing.T) {
 	require.NoError(t, err)
 	iter2, err := state.EvalsByIDPrefix(ws, ns2.Name, sharedPrefix, SortDefault)
 	require.NoError(t, err)
+	iter3, err := state.EvalsByIDPrefix(ws, structs.AllNamespacesSentinel, sharedPrefix, SortDefault)
+	require.NoError(t, err)
 
 	evalsNs1 := gatherEvals(iter1)
 	evalsNs2 := gatherEvals(iter2)
+	evalsNs3 := gatherEvals(iter3)
 	require.Len(t, evalsNs1, 1)
 	require.Len(t, evalsNs2, 1)
+	require.Len(t, evalsNs3, 2)
 
 	iter1, err = state.EvalsByIDPrefix(ws, ns1.Name, eval1.ID[:8], SortDefault)
 	require.NoError(t, err)