Exclude aborted jobs from pending count and stats#505
Merged
Conversation
getPendingCount() and getPendingStats() counted jobs that had exhausted their retries (status = aborted) even though they are terminal and will never run again. That inflated the admin pending total and any external caller. They now exclude status = aborted, matching isQueued() and the admin status filter. Two interactions handled: - The admin dashboard derives pending = totalPending - running - failed. Aborted rows carry a failure_message, so the failed operand still counted them; the derivation now subtracts only still-retriable failures to avoid double-removing aborted rows (which zeroed out real pending work). - reset() now clears status so a reset job loses its terminal aborted state and counts as pending and gets picked up again.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Summary
getPendingCount()/getPendingStats()no longer count jobs that exhausted their retries (status = aborted). Those are terminal and will never run again, so they were wrongly inflating the admin pending total and any external caller. Now consistent withisQueued()and the admin status filter.pending = totalPending - running - failedpreviously double-removed aborted rows (they carry afailure_message, so thefailedoperand still counted them whiletotalPendingno longer does). The derivation now subtracts only still-retriable failures, so a single real pending job alongside an aborted one no longer renders as0pending.reset()now clearsstatus, so resetting an aborted job for rerun returns it to the pending universe and lets a worker pick it up again.Notes
statuscolumn already exists.requestJob) was already terminal-safe viaattempts < retries + 1; unchanged.