mxqkill: Correct job counts for cancelled groups #155
Merged
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
Commit 22aadf3 ("sql: Implement mx_update_job2 trigger") eliminated the `INQ`->`CANCELLED` housekeeping trigger, claiming that the job state is no longer set to `CANCELLED` by code. This is incorrect, as update_job_status_cancelled_by_group() still sets the job status to `CANCELLED` when a group is cancelled. Modify update_job_status_cancelled_by_group() to set the `job_cancelled` flag instead of the `job_status`. Leave the job status transition to the trigger. Exclude `ASSIGNED` jobs, as the daemon handles them. Also, remove unnecessary checks for unset `host_hostname`, `server_id`, and `host_pid`.
Sign in
to join this conversation on GitHub.
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.
Commit 22aadf3 ("sql: Implement mx_update_job2 trigger") eliminated the
INQ->CANCELLEDhousekeeping trigger, claiming that the job state is no longer set toCANCELLEDby code.This is incorrect, as update_job_status_cancelled_by_group() still sets the job status to
CANCELLEDwhen a group is cancelled.Modify update_job_status_cancelled_by_group() to set the
job_cancelledflag instead of thejob_status. Leave the job status transition to the trigger.Exclude
ASSIGNEDjobs, as the daemon handles them. Also, remove unnecessary checks for unsethost_hostname,server_id, andhost_pid.Fixes #154