MC-22212: 1213 Deadlock found when trying to get lock

Author: dhorytskyi

app/code/Magento/CatalogInventory/Model/Plugin/PriceIndexUpdater.php

@@ -5,14 +5,13 @@
  */
 namespace Magento\CatalogInventory\Model\ResourceModel\Stock;
 
-use Magento\CatalogInventory\Api\Data\StockItemInterface;
+use Magento\Catalog\Model\Indexer\Product\Price\Processor as PriceIndexProcessor;
 use Magento\CatalogInventory\Api\StockConfigurationInterface;
 use Magento\CatalogInventory\Model\Stock;
 use Magento\CatalogInventory\Model\Indexer\Stock\Processor;
 use Magento\Framework\Model\AbstractModel;
 use Magento\Framework\Model\ResourceModel\Db\Context;
 use Magento\Framework\DB\Select;
-use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Stdlib\DateTime\DateTime;
 
 /**
@@ -42,27 +41,33 @@ class Item extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
      */
     private $dateTime;
 
+    /**
+     * @var PriceIndexProcessor
+     */
+    private $priceIndexProcessor;
+
     /**
      * @param Context $context
      * @param Processor $processor
-     * @param string $connectionName
      * @param StockConfigurationInterface $stockConfiguration
      * @param DateTime $dateTime
+     * @param PriceIndexProcessor $priceIndexProcessor
+     * @param string $connectionName
      */
     public function __construct(
         Context $context,
         Processor $processor,
-        $connectionName = null,
-        StockConfigurationInterface $stockConfiguration = null,
-        DateTime $dateTime = null
+        StockConfigurationInterface $stockConfiguration,
+        DateTime $dateTime,
+        PriceIndexProcessor $priceIndexProcessor,
+        $connectionName = null
     ) {
         $this->stockIndexerProcessor = $processor;
         parent::__construct($context, $connectionName);
 
-        $this->stockConfiguration = $stockConfiguration ??
-            ObjectManager::getInstance()->get(StockConfigurationInterface::class);
-        $this->dateTime = $dateTime ??
-            ObjectManager::getInstance()->get(DateTime::class);
+        $this->stockConfiguration = $stockConfiguration;
+        $this->dateTime = $dateTime;
+        $this->priceIndexProcessor = $priceIndexProcessor;
     }
 
     /**
@@ -144,10 +149,28 @@ protected function _prepareDataForTable(\Magento\Framework\DataObject $object, $
     protected function _afterSave(AbstractModel $object)
     {
         parent::_afterSave($object);
-        /** @var StockItemInterface $object */
+
+        $productId = $object->getProductId();
         if ($this->processIndexEvents) {
-            $this->stockIndexerProcessor->reindexRow($object->getProductId());
+            $this->addCommitCallback(function () use ($productId) {
+                $this->stockIndexerProcessor->reindexRow($productId);
+            });
+
         }
+        $fields = [
+            'is_in_stock',
+            'use_config_manage_stock',
+            'manage_stock',
+        ];
+        foreach ($fields as $field) {
+            if ($object->dataHasChangedFor($field)) {
+                $this->addCommitCallback(function () use ($productId) {
+                    $this->priceIndexProcessor->reindexRow($productId);
+                });
+                break;
+            }
+        }
+
         return $this;
     }
 

app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item.php

@@ -129,9 +129,6 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\CatalogInventory\Model\ResourceModel\Stock\Item">
-        <plugin name="priceIndexUpdater" type="Magento\CatalogInventory\Model\Plugin\PriceIndexUpdater" />
-    </type>
     <type name="Magento\Catalog\Controller\Adminhtml\Product\Action\Attribute\Save">
         <plugin name="massAction" type="Magento\CatalogInventory\Plugin\MassUpdateProductAttribute" />
     </type>