ACP2E-2504: [TMNA] Slow Query Investigation

Author: dhorytskyi

app/code/Magento/Catalog/Model/Attribute/Backend/WebsiteSpecific/ValueSynchronizer.php

@@ -20,6 +20,9 @@
 
 use Magento\AsynchronousOperations\Api\Data\OperationInterface;
 use Magento\Catalog\Model\ResourceModel\Attribute\WebsiteAttributesSynchronizer;
+use Magento\Framework\DB\Adapter\ConnectionException;
+use Magento\Framework\DB\Adapter\DeadlockException;
+use Magento\Framework\DB\Adapter\LockWaitException;
 use Magento\Framework\EntityManager\EntityManager;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Serialize\SerializerInterface;
@@ -55,6 +58,10 @@ public function process(OperationInterface $operation): void
             $this->websiteAttributesSynchronizer->synchronizeStoreValues($data['store_id']);
             $operation->setStatus(OperationInterface::STATUS_TYPE_COMPLETE);
             $operation->setResultMessage(null);
+        } catch (LockWaitException|DeadlockException|ConnectionException $e) {
+            $operation->setStatus(OperationInterface::STATUS_TYPE_RETRIABLY_FAILED);
+            $operation->setErrorCode($e->getCode());
+            $operation->setResultMessage($e->getMessage());
         } catch (LocalizedException $e) {
             $operation->setStatus(OperationInterface::STATUS_TYPE_NOT_RETRIABLY_FAILED);
             $operation->setErrorCode($e->getCode());

app/code/Magento/Catalog/Model/ResourceModel/Attribute/WebsiteAttributesSynchronizer.php

@@ -141,15 +141,8 @@ public function synchronize()
      */
     public function synchronizeStoreValues(int $storeId): void
     {
-        $this->connection->beginTransaction();
-        try {
-            foreach (array_keys($this->tableMetaDataClass) as $tableName) {
-                $this->synchronizeTable($tableName, $storeId);
-            }
-            $this->connection->commit();
-        } catch (\Exception $e) {
-            $this->connection->rollBack();
-            throw $e;
+        foreach (array_keys($this->tableMetaDataClass) as $tableName) {
+            $this->synchronizeTable($tableName, $storeId);
         }
     }
 

app/code/Magento/Catalog/Test/Unit/Observer/SynchronizeWebsiteAttributesOnStoreChangeTest.php

@@ -7,7 +7,7 @@
 
 namespace Magento\Catalog\Test\Unit\Observer;
 
-use Magento\Catalog\Model\ResourceModel\Attribute\WebsiteAttributesSynchronizer;
+use Magento\Catalog\Model\Attribute\Backend\WebsiteSpecific\Scheduler;
 use Magento\Catalog\Observer\SynchronizeWebsiteAttributesOnStoreChange;
 use Magento\Framework\Event\Observer;
 use Magento\Store\Model\Store;
@@ -25,17 +25,11 @@ public function testExecuteInvalidStore($invalidDataObject)
             'data_object' => $invalidDataObject,
         ]);
 
-        $synchronizerMock = $this->getMockBuilder(WebsiteAttributesSynchronizer::class)
-            ->disableOriginalConstructor()
-            ->setMethods([
-                'scheduleSynchronization',
-            ])
-            ->getMock();
-
-        $synchronizerMock->expects($this->never())
-            ->method('scheduleSynchronization');
+        $schedulerMock = $this->createMock(Scheduler::class);
+        $schedulerMock->expects(self::never())
+            ->method('execute');
 
-        $instance = new SynchronizeWebsiteAttributesOnStoreChange($synchronizerMock);
+        $instance = new SynchronizeWebsiteAttributesOnStoreChange($schedulerMock);
         $result = $instance->execute($eventObserver);
         $this->assertNull($result);
     }
@@ -62,17 +56,11 @@ public function testExecuteStoreHasNoChanges(Store $store)
             'data_object' => $store,
         ]);
 
-        $synchronizerMock = $this->getMockBuilder(WebsiteAttributesSynchronizer::class)
-            ->disableOriginalConstructor()
-            ->setMethods([
-                'scheduleSynchronization',
-            ])
-            ->getMock();
-
-        $synchronizerMock->expects($this->never())
-            ->method('scheduleSynchronization');
+        $schedulerMock = $this->createMock(Scheduler::class);
+        $schedulerMock->expects(self::never())
+            ->method('execute');
 
-        $instance = new SynchronizeWebsiteAttributesOnStoreChange($synchronizerMock);
+        $instance = new SynchronizeWebsiteAttributesOnStoreChange($schedulerMock);
         $result = $instance->execute($eventObserver);
         $this->assertNull($result);
     }
@@ -116,17 +104,11 @@ public function testExecuteWebsiteIdIsNoChangedAndNotNew(Store $store)
             'data_object' => $store,
         ]);
 
-        $synchronizerMock = $this->getMockBuilder(WebsiteAttributesSynchronizer::class)
-            ->disableOriginalConstructor()
-            ->setMethods([
-                'scheduleSynchronization',
-            ])
-            ->getMock();
-
-        $synchronizerMock->expects($this->never())
-            ->method('scheduleSynchronization');
+        $schedulerMock = $this->createMock(Scheduler::class);
+        $schedulerMock->expects(self::never())
+            ->method('execute');
 
-        $instance = new SynchronizeWebsiteAttributesOnStoreChange($synchronizerMock);
+        $instance = new SynchronizeWebsiteAttributesOnStoreChange($schedulerMock);
         $result = $instance->execute($eventObserver);
         $this->assertNull($result);
     }
@@ -189,17 +171,11 @@ public function testExecuteSuccess(Store $store)
             'data_object' => $store,
         ]);
 
-        $synchronizerMock = $this->getMockBuilder(WebsiteAttributesSynchronizer::class)
-            ->disableOriginalConstructor()
-            ->setMethods([
-                'scheduleSynchronization',
-            ])
-            ->getMock();
-
-        $synchronizerMock->expects($this->once())
-            ->method('scheduleSynchronization');
+        $schedulerMock = $this->createMock(Scheduler::class);
+        $schedulerMock->expects(self::once())
+            ->method('execute');
 
-        $instance = new SynchronizeWebsiteAttributesOnStoreChange($synchronizerMock);
+        $instance = new SynchronizeWebsiteAttributesOnStoreChange($schedulerMock);
         $result = $instance->execute($eventObserver);
         $this->assertNull($result);
     }