luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

backport of commit 46442f441f8de8d22dbc243af041aa38c58bd6bc (#19158) 

Co-authored-by: Jorge Marey <6938602+jorgemarey@users.noreply.github.com>
This commit is contained in:
hc-github-team-nomad-core 2023-11-23 09:58:50 -06:00 committed by GitHub
parent 78d7c2bbee
commit 9f804b0b4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/18967.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:bug
core: Fix incorrect submit time for stopped jobs
```

9
nomad/fsm.go
View File

@ -726,7 +726,7 @@ func (n *nomadFSM) applyDeregisterJob(msgType structs.MessageType, buf []byte, i
}
err := n.state.WithWriteTransaction(msgType, index, func(tx state.Txn) error {
err := n.handleJobDeregister(index, req.JobID, req.Namespace, req.Purge, req.NoShutdownDelay, tx)
err := n.handleJobDeregister(index, req.JobID, req.Namespace, req.Purge, req.SubmitTime, req.NoShutdownDelay, tx)
if err != nil {
n.logger.Error("deregistering job failed",
@ -766,7 +766,7 @@ func (n *nomadFSM) applyBatchDeregisterJob(msgType structs.MessageType, buf []by
// evals for jobs whose deregistering didn't get committed yet.
err := n.state.WithWriteTransaction(msgType, index, func(tx state.Txn) error {
for jobNS, options := range req.Jobs {
if err := n.handleJobDeregister(index, jobNS.ID, jobNS.Namespace, options.Purge, false, tx); err != nil {
if err := n.handleJobDeregister(index, jobNS.ID, jobNS.Namespace, options.Purge, req.SubmitTime, false, tx); err != nil {
n.logger.Error("deregistering job failed", "job", jobNS.ID, "error", err)
return err
}
@ -791,7 +791,7 @@ func (n *nomadFSM) applyBatchDeregisterJob(msgType structs.MessageType, buf []by
// handleJobDeregister is used to deregister a job. Leaves error logging up to
// caller.
func (n *nomadFSM) handleJobDeregister(index uint64, jobID, namespace string, purge bool, noShutdownDelay bool, tx state.Txn) error {
func (n *nomadFSM) handleJobDeregister(index uint64, jobID, namespace string, purge bool, submitTime int64, noShutdownDelay bool, tx state.Txn) error {
// If it is periodic remove it from the dispatcher
if err := n.periodicDispatcher.Remove(namespace, jobID); err != nil {
return fmt.Errorf("periodicDispatcher.Remove failed: %w", err)
@ -839,6 +839,9 @@ func (n *nomadFSM) handleJobDeregister(index uint64, jobID, namespace string, pu
stopped := current.Copy()
stopped.Stop = true
if submitTime != 0 {
stopped.SubmitTime = submitTime
}
if err := n.state.UpsertJobTxn(index, nil, stopped, tx); err != nil {
return fmt.Errorf("UpsertJob failed: %w", err)

4
nomad/job_endpoint.go
View File

@ -892,6 +892,7 @@ func (j *Job) Deregister(args *structs.JobDeregisterRequest, reply *structs.JobD
reply.EvalID = eval.ID
}
args.SubmitTime = now
args.Eval = eval
// Commit the job update via Raft
@ -993,6 +994,8 @@ func (j *Job) BatchDeregister(args *structs.JobBatchDeregisterRequest, reply *st
args.Evals = append(args.Evals, eval)
}
args.SubmitTime = time.Now().UnixNano()
// Commit this update via Raft
_, index, err := j.srv.raftApply(structs.JobBatchDeregisterRequestType, args)
if err != nil {
@ -1119,6 +1122,7 @@ func (j *Job) Scale(args *structs.JobScaleRequest, reply *structs.JobRegisterRes
// Update group count
group.Count = int(*args.Count)
job.SubmitTime = now
// Block scaling event if there's an active deployment
deployment, err := snap.LatestDeploymentByJobID(ws, namespace, args.JobID)

10
nomad/structs/structs.go
View File

@ -773,6 +773,9 @@ type JobDeregisterRequest struct {
// Eval is the evaluation to create that's associated with job deregister
Eval *Evaluation
// SubmitTime is the time at which the job was requested to be stopped
SubmitTime int64
WriteRequest
}
@ -785,6 +788,9 @@ type JobBatchDeregisterRequest struct {
// Evals is the set of evaluations to create.
Evals []*Evaluation
// SubmitTime is the time at which the job was requested to be stopped
SubmitTime int64
WriteRequest
}
@ -4512,8 +4518,8 @@ type Job struct {
// on each job register.
Version uint64
// SubmitTime is the time at which the job was submitted as a UnixNano in
// UTC
// SubmitTime is the time at which the job version was submitted as
// UnixNano in UTC
SubmitTime int64
// Raft Indexes