Skip to content

Fix infinite loop and unbounded batches in persistent quote cleanup cron #333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rhoerr merged 3 commits into from
Aug 31, 2026
Merged

Fix infinite loop and unbounded batches in persistent quote cleanup cron #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cbd4649
fix: prevent infinite loop and unbounded batches in persistent quote …
TuVanDev Aug 30, 2026
13090ac
fix: apply order and limit to the returned expired-quote collection
TuVanDev Aug 30, 2026
fe55946
test: stub order() and limit() for the returned collections Select mock
TuVanDev Aug 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/code/Magento/Persistent/Model/CleanExpiredPersistentQuotes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,14 @@ private function processStoreQuotes(StoreInterface $store): void

foreach ($quotesToProcess as $quote) {
$count++;
$lastProcessedId = (int)$quote->getId();
try {
$this->quoteRepository->delete($quote);
$lastProcessedId = (int)$quote->getId();
} catch (Exception $e) {
$this->logger->error(sprintf(
'Unable to delete expired quote (ID: %s): %s',
$quote->getId(),
(string)$e
$e->getMessage()
));
}
if ($count % $this->batchSize === 0) {
Expand Down
5 changes: 4 additions & 1 deletion app/code/Magento/Persistent/Model/ResourceModel/ExpiredPersistentQuotesCollection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,10 @@ public function getExpiredPersistentQuotes(StoreInterface $store, int $lastId, i
Select::SQL_UNION_ALL
);

$quotes->getSelect()->where('main_table.entity_id IN (' . $selectQuoteIds . ')');
$quotes->getSelect()
->where('main_table.entity_id IN (' . $selectQuoteIds . ')')
->order('main_table.entity_id ' . Select::SQL_ASC)
->limit($batchSize);

return $quotes;
}
Expand Down
10 changes: 10 additions & 0 deletions ...agento/Persistent/Test/Unit/Model/ResourceModel/ExpiredPersistentQuotesCollectionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,16 @@ public function testGetExpiredPersistentQuotes(): void
->with($this->stringContains('main_table.entity_id IN ('))
->willReturnSelf();

$dbSelectMock3->method('where')
->with($this->stringContains('main_table.entity_id IN ('))
->willReturnSelf();
$dbSelectMock3->method('order')
->with('main_table.entity_id ' . Select::SQL_ASC)
->willReturnSelf();
$dbSelectMock3->method('limit')
->with(100)
->willReturnSelf();

$result = $this->model->getExpiredPersistentQuotes($storeMock, 0, 100);
$this->assertSame($quoteCollectionMock, $result);
}
Expand Down
Loading