MAGETWO-65388: Indexation process in non-locking way for stock indexer

Author: omiroshnichenko

app/code/Magento/Bundle/Model/ResourceModel/Indexer/Stock.php

@@ -39,9 +39,9 @@ public function __construct(
         \Magento\Indexer\Model\Indexer\StateFactory $stateFactory = null,
         \Magento\Indexer\Model\ResourceModel\FrontendResource $indexerStockFrontendResource = null
     ) {
+        parent::__construct($context, $tableStrategy, $eavConfig, $scopeConfig, $connectionName, $stateFactory);
         $this->indexerStockFrontendResource = $indexerStockFrontendResource ?: ObjectManager::getInstance()
             ->get(\Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\FrontendResource::class);
-        parent::__construct($context, $tableStrategy, $eavConfig, $scopeConfig, $connectionName, $stateFactory);
     }
 
     /**

app/code/Magento/Bundle/Model/ResourceModel/Selection/Collection.php

@@ -105,9 +105,6 @@ public function __construct(
         \Magento\Indexer\Model\ResourceModel\FrontendResource $indexerFrontendResource = null,
         \Magento\Indexer\Model\ResourceModel\FrontendResource $indexerStockFrontendResource = null
     ) {
-
-        $this->indexerStockFrontendResource = $indexerStockFrontendResource ?: ObjectManager::getInstance()
-            ->get(\Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\FrontendResource::class);
         parent::__construct(
             $entityFactory,
             $logger,
@@ -133,6 +130,8 @@ public function __construct(
             $metadataPool,
             $indexerFrontendResource
         );
+        $this->indexerStockFrontendResource = $indexerStockFrontendResource ?: ObjectManager::getInstance()
+            ->get(\Magento\CatalogInventory\Model\ResourceModel\Indexer\Stock\FrontendResource::class);
     }
 
     /**

app/code/Magento/Bundle/Test/Unit/Model/ResourceModel/Selection/CollectionTest.php

@@ -12,6 +12,7 @@
 use Magento\Framework\Validator\UniversalFactory;
 use Magento\Eav\Model\Entity\AbstractEntity;
 use Magento\Framework\DB\Adapter\AdapterInterface;
+use Magento\Catalog\Model\ResourceModel\Product\Collection\ProductLimitationFactory;
 use Magento\Framework\DB\Select;
 
 /**
@@ -84,6 +85,9 @@ protected function setUp()
         $this->select = $this->getMockBuilder(Select::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $factory = $this->getMockBuilder(ProductLimitationFactory::class)
+            ->setMethods(['create'])
+            ->getMock();
 
         $this->storeManager->expects($this->any())
             ->method('getStore')
@@ -109,6 +113,7 @@ protected function setUp()
             [
                 'storeManager' => $this->storeManager,
                 'universalFactory' => $this->universalFactory,
+                'productLimitationFactory' => $factory,
                 'indexerStockFrontendResource' => $this->frontendResource
             ]
         );
@@ -122,10 +127,11 @@ public function testAddQuantityFilter()
             ->willReturn($tableName);
         $this->select->expects($this->once())
             ->method('joinInner')
-            ->with(['stock' => $tableName],
+            ->with(
+                ['stock' => $tableName],
                 'selection.product_id = stock.product_id',
-                [])
-            ->willReturnSelf();
+                []
+            )->willReturnSelf();
         $this->assertEquals($this->model, $this->model->addQuantityFilter());
     }
 }