Repository navigation
Conversation
This branch has not been deployed
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
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
QueueJobModel::popWithLock()reserves a job inside a transaction, but the transaction was not closed on every code path, and a successful reservation was never verified.SELECTfailed, the method returnednullwithout callingtransComplete(). The transaction depth stayed unbalanced, so a latertransComplete()from an unrelated (nested) operation could commit or roll back work it did not own, and the connection remained inside an open transaction.UPDATEthat changes the job status toRESERVEDwas discarded. A job could therefore be returned to the worker (and processed) even though the status was never actually persisted, which allows two workers to process the same job.Changes
src/Models/QueueJobModel.phptry { ... } finally { $this->db->transComplete(); }so the transaction is always closed, whichever path is taken.update() !== false && $this->db->affectedRows() === 1. When the reservation cannot be confirmed, the transaction is rolled back andnullis returned, so the job staysPENDINGand is never processed.nullbefore the update.Testing
Added three cases to
tests/Models/QueueJobModelTest.php:testPopWithLockReturnsNullAndClosesTransactionWhenQueryFails()— after a failed query,transDepthis back to0.testPopWithLockRollsBackAndReturnsNullWhenUpdateFails()— whenupdate()returnsfalse, the method returnsnull, rolls back, and the row remainsPENDING.testPopWithLockRollsBackAndReturnsNullWhenAffectedRowsIsNotOne()— when the update affects no rows, the same rollback andPENDINGstate are asserted.Verified locally on PHP 8.5 with PHPUnit 11.5: