Skip to content

Catch throwables in mview updating #23124

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

Closed
wants to merge 2 commits into from
Closed

Catch throwables in mview updating #23124

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ffb199
Catch throwables in mview updating
Jun 4, 2019
e05e46d
Refactor View::update
Jul 15, 2019
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
57 changes: 39 additions & 18 deletions lib/internal/Magento/Framework/Mview/View.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,42 +274,63 @@ public function update()
$lastVersionId = (int) $this->getState()->getVersionId();
$action = $this->actionFactory->get($this->getActionClass());

$this->executeAction($action, $lastVersionId, $currentVersionId);

try {
$this->getState()->setStatus(View\StateInterface::STATUS_WORKING)->save();

$versionBatchSize = self::$maxVersionQueryBatch;
$batchSize = isset($this->changelogBatchSize[$this->getChangelog()->getViewId()])
? $this->changelogBatchSize[$this->getChangelog()->getViewId()]
: self::DEFAULT_BATCH_SIZE;

for ($versionFrom = $lastVersionId; $versionFrom < $currentVersionId; $versionFrom += $versionBatchSize) {
// Don't go past the current version for atomicy.
$versionTo = min($currentVersionId, $versionFrom + $versionBatchSize);
$ids = array_map('intval', $this->getChangelog()->getList($versionFrom, $versionTo));

// We run the actual indexer in batches. Chunked AFTER loading to avoid duplicates in separate chunks.
$chunks = array_chunk($ids, $batchSize);
foreach ($chunks as $ids) {
$action->execute($ids);
}
}

$this->getState()->loadByView($this->getId());
$statusToRestore = $this->getState()->getStatus() == View\StateInterface::STATUS_SUSPENDED
? View\StateInterface::STATUS_SUSPENDED
: View\StateInterface::STATUS_IDLE;
$this->getState()->setVersionId($currentVersionId)->setStatus($statusToRestore)->save();
} catch (\Exception $exception) {
} catch (\Throwable $exception) {
$this->getState()->loadByView($this->getId());
$statusToRestore = $this->getState()->getStatus() == View\StateInterface::STATUS_SUSPENDED
? View\StateInterface::STATUS_SUSPENDED
: View\StateInterface::STATUS_IDLE;
$this->getState()->setStatus($statusToRestore)->save();
if (!$exception instanceof \Exception) {
$exception = new \RuntimeException(
'Error when updating an mview',
0,
$exception
);
}
throw $exception;
}
}
}

/**
* Execute action from last version to current version, by batches
*
* @param ActionInterface $action
* @param int $lastVersionId
* @param int $currentVersionId
* @return void
* @throws \Exception
*/
private function executeAction(ActionInterface $action, int $lastVersionId, int $currentVersionId)
{
$versionBatchSize = self::$maxVersionQueryBatch;
$batchSize = isset($this->changelogBatchSize[$this->getChangelog()->getViewId()])
? $this->changelogBatchSize[$this->getChangelog()->getViewId()]
: self::DEFAULT_BATCH_SIZE;

for ($versionFrom = $lastVersionId; $versionFrom < $currentVersionId; $versionFrom += $versionBatchSize) {
// Don't go past the current version for atomicy.
$versionTo = min($currentVersionId, $versionFrom + $versionBatchSize);
$ids = array_map('intval', $this->getChangelog()->getList($versionFrom, $versionTo));

// We run the actual indexer in batches. Chunked AFTER loading to avoid duplicates in separate chunks.
$chunks = array_chunk($ids, $batchSize);
foreach ($chunks as $ids) {
$action->execute($ids);
}
}
}

/**
* Suspend view updates and set version ID to changelog's end
*
Expand Down