ENGCOM-5210: Catch throwables in mview updating #23125

Author: sivaschenko

lib/internal/Magento/Framework/Mview/View.php

@@ -4,6 +4,8 @@
  * See COPYING.txt for license details.
  */
 
+declare(strict_types=1);
+
 namespace Magento\Framework\Mview;
 
 use InvalidArgumentException;
@@ -254,39 +256,60 @@ public function update()
         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 ($vsFrom = $lastVersionId; $vsFrom < $currentVersionId; $vsFrom += $versionBatchSize) {
-                // Don't go past the current version for atomicy.
-                $versionTo = min($currentVersionId, $vsFrom + $versionBatchSize);
-                $ids = $this->getChangelog()->getList($vsFrom, $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->executeAction($action, $lastVersionId, $currentVersionId);
 
             $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 ($vsFrom = $lastVersionId; $vsFrom < $currentVersionId; $vsFrom += $versionBatchSize) {
+            // Don't go past the current version for atomicity.
+            $versionTo = min($currentVersionId, $vsFrom + $versionBatchSize);
+            $ids = $this->getChangelog()->getList($vsFrom, $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
      *