populate count in Eval.List RPC

hashicorp · Nov 3, 2022 · fa30924 · fa30924
1 parent 721d1c6
commit fa30924
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/nomad/eval_endpoint.go b/nomad/eval_endpoint.go
@@ -687,10 +687,14 @@ func (e *Eval) List(args *structs.EvalListRequest, reply *structs.EvalListRespon
 				}
 
 				var evals []*structs.Evaluation
+				count := 0
 				paginator, err := paginator.NewPaginator(iter, tokenizer, filters, args.QueryOptions,
 					func(raw interface{}) error {
-						eval := raw.(*structs.Evaluation)
-						evals = append(evals, eval)
+						if !args.CountOnly {
+							eval := raw.(*structs.Evaluation)
+							evals = append(evals, eval)
+						}
+						count++
 						return nil
 					})
 				if err != nil {
@@ -706,6 +710,7 @@ func (e *Eval) List(args *structs.EvalListRequest, reply *structs.EvalListRespon
 
 				reply.QueryMeta.NextToken = nextToken
 				reply.Evaluations = evals
+				reply.Count = count
 			}
 
 			// Use the last index that affected the jobs table

diff --git a/nomad/structs/structs.go b/nomad/structs/structs.go
@@ -890,6 +890,7 @@ type EvalDequeueRequest struct {
 type EvalListRequest struct {
 	FilterJobID      string
 	FilterEvalStatus string
+	CountOnly        bool
 	QueryOptions
 }
 
@@ -1602,6 +1603,7 @@ type DeploymentListResponse struct {
 // EvalListResponse is used for a list request
 type EvalListResponse struct {
 	Evaluations []*Evaluation
+	Count       int
 	QueryMeta
 }