state store: fix logic for evaluating job status #24974
Open
+313
−247
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mismithhisler
commented
Jan 29, 2025
mismithhisler
commented
Jan 29, 2025
mismithhisler
commented
Jan 31, 2025
| @@ -3851,11 +3852,6 @@ func (s *StateStore) EvalsByJob(ws memdb.WatchSet, namespace, jobID string) ([]* | |||
|
|
|||
| e := raw.(*structs.Evaluation) | |||
|
|
|||
| // Filter non-exact matches | |||
| if e.JobID != jobID { | |||
There was a problem hiding this comment.
This isn't necessary anymore because periodic jobs do not get an evaluation.
mismithhisler
commented
Jan 31, 2025
| @@ -5532,6 +5527,12 @@ func (s *StateStore) setJobStatus(index uint64, txn *txn, | |||
| if err := s.setJobSummary(txn, updated, index, oldStatus, newStatus); err != nil { | |||
| return fmt.Errorf("job summary update failed %w", err) | |||
| } | |||
|
|
|||
| // Update the job version details | |||
| if err := s.upsertJobVersion(index, updated, txn); err != nil { | |||
There was a problem hiding this comment.
This feels odd to call here, but it's necessary to also update a job's version status anytime we are updating the job summary, or they can get out of sync.
mismithhisler
commented
Jan 31, 2025
| @@ -5084,6 +5087,7 @@ func TestStateStore_DeleteEval_Eval(t *testing.T) { | |||
| require.Equal(t, uint64(1002), evalsIndex) | |||
| } | |||
|
|
|||
| // This tests the evalDelete boolean by deleting a Pending eval and Pending Alloc. | |||
There was a problem hiding this comment.
This job tests the evalDelete boolean, but it's an odd test because it forcefully deletes a non-terminal eval and non-terminal alloc, and then makes sure we set the job to "dead".
mismithhisler
commented
Feb 4, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
The state store persists the correct job version for job summaries, but not for specific versions. This fix attempts to simplify the logic around evaluating a job's status, and then make's sure it is persisted.
Testing & Reproduction steps
See GH issue for replication steps
Links
Fixes GH #24957
Contributor Checklist
changelog entry using the
make clcommand.ensure regressions will be caught.
and job configuration, please update the Nomad website documentation to reflect this. Refer to
the website README for docs guidelines. Please also consider whether the
change requires notes within the upgrade guide.
Reviewer Checklist
backporting document.
in the majority of situations. The main exceptions are long-lived feature branches or merges where
history should be preserved.
within the public repository.