Skip to content

Commit

Permalink
scaling: set Index on nil-job scale status reply (#18637)
Browse files Browse the repository at this point in the history
returning a nil error in a blockingOptions.run()
without increasing the reply Index can cause the
query to block indefinitely (until timeout).

this fixes that happening in Job.ScaleStatus
when the job is deleted -- the job going away
should now return as not-found and provide a new
index for the caller to try if they so please.
  • Loading branch information
gulducat committed Oct 3, 2023
1 parent 52ef476 commit e7136f8
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
3 changes: 3 additions & 0 deletions .changelog/18637.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
scaling: Unblock blocking queries to /v1/job/{job-id}/scale if the job goes away
```
7 changes: 6 additions & 1 deletion nomad/job_endpoint.go
Original file line number Diff line number Diff line change
Expand Up @@ -2216,8 +2216,13 @@ func (j *Job) ScaleStatus(args *structs.JobScaleStatusRequest,
return err
}
if job == nil {
// HTTPServer.jobScaleStatus() will 404 if this is nil
reply.JobScaleStatus = nil
return nil

// reply with latest index, since if the job does get created,
// it must necessarily be later than current latest.
reply.Index, err = state.LatestIndex()
return err
}

events, eventsIndex, err := state.ScalingEventsByJob(ws, args.RequestNamespace(), args.JobID)
Expand Down

0 comments on commit e7136f8

Please sign in to comment.