kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-01 16:05:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

scaling: set Index on nil-job scale status reply (#18637)

Browse Source 
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.
This commit is contained in:
Daniel Bennett
2023-10-03 12:03:20 -05:00
committed by GitHub
parent 52ef476a72
commit e7136f80c5
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/18637.txt Normal file
View File

@@ -0,0 +1,3 @@
```release-note:bug
scaling: Unblock blocking queries to /v1/job/{job-id}/scale if the job goes away
```

7
nomad/job_endpoint.go
View File

@@ -2216,8 +2216,13 @@ func (j *Job) ScaleStatus(args *structs.JobScaleStatusRequest,
return err return err
} }
if job == nil { if job == nil {
// HTTPServer.jobScaleStatus() will 404 if this is nil
reply.JobScaleStatus = 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) events, eventsIndex, err := state.ScalingEventsByJob(ws, args.RequestNamespace(), args.JobID)