From ce6c86a05742d98521a8a1d7b0a533bf8b549b25 Mon Sep 17 00:00:00 2001 From: hc-github-team-nomad-core <82989552+hc-github-team-nomad-core@users.noreply.github.com> Date: Tue, 3 Oct 2023 12:27:26 -0500 Subject: [PATCH] backport of commit e7136f80c5c1277ea2dea4eeeda84005224d7835 (#18648) Co-authored-by: Daniel Bennett --- .changelog/18637.txt | 3 +++ nomad/job_endpoint.go | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 .changelog/18637.txt diff --git a/.changelog/18637.txt b/.changelog/18637.txt new file mode 100644 index 000000000..aaa01ad4a --- /dev/null +++ b/.changelog/18637.txt @@ -0,0 +1,3 @@ +```release-note:bug +scaling: Unblock blocking queries to /v1/job/{job-id}/scale if the job goes away +``` diff --git a/nomad/job_endpoint.go b/nomad/job_endpoint.go index 44e1bc1a4..54b1345f1 100644 --- a/nomad/job_endpoint.go +++ b/nomad/job_endpoint.go @@ -2209,8 +2209,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)