ACP2E-1569: Elasticsearch Indexer document version changes version when new/existing products are imported

Author: o-iegorov

app/code/Magento/CatalogImportExport/Model/Import/Product.php

@@ -2466,6 +2466,10 @@ private function reindexProducts($productIdsToReindex = [])
         if (is_array($productIdsToReindex) && count($productIdsToReindex) > 0 && !$indexer->isScheduled()) {
             $indexer->reindexList($productIdsToReindex);
         }
+        $indexer = $this->indexerRegistry->get('catalog_product_price');
+        if (is_array($productIdsToReindex) && count($productIdsToReindex) > 0 && !$indexer->isScheduled()) {
+            $indexer->reindexList($productIdsToReindex);
+        }
     }
 
     /**

app/code/Magento/CatalogImportExport/Model/Indexer/Category/Product/Plugin/Import.php

@@ -34,7 +34,7 @@ public function __construct(
     public function afterImportSource(\Magento\ImportExport\Model\Import $subject, $import)
     {
         if (!$this->_indexerCategoryProductProcessor->isIndexerScheduled()) {
-            $this->_indexerCategoryProductProcessor->markIndexerAsInvalid();
+            //$this->_indexerCategoryProductProcessor->markIndexerAsInvalid();
         }
         return $import;
     }

app/code/Magento/CatalogImportExport/Model/Indexer/Product/Category/Plugin/Import.php

@@ -34,7 +34,7 @@ public function __construct(
     public function afterImportSource(\Magento\ImportExport\Model\Import $subject, $import)
     {
         if (!$this->_indexerProductCategoryProcessor->isIndexerScheduled()) {
-            $this->_indexerProductCategoryProcessor->markIndexerAsInvalid();
+            //$this->_indexerProductCategoryProcessor->markIndexerAsInvalid();
         }
         return $import;
     }

app/code/Magento/CatalogImportExport/Model/Indexer/Product/Price/Plugin/Import.php

@@ -30,10 +30,12 @@ public function __construct(\Magento\Framework\Indexer\IndexerRegistry $indexerR
      */
     public function afterImportSource(\Magento\ImportExport\Model\Import $subject, $result)
     {
+        /*
         $priceIndexer = $this->indexerRegistry->get(\Magento\Catalog\Model\Indexer\Product\Price\Processor::INDEXER_ID);
         if (!$priceIndexer->isScheduled()) {
             $priceIndexer->invalidate();
         }
+        */
         return $result;
     }
 }

app/code/Magento/CatalogImportExport/Model/Indexer/Stock/Plugin/Import.php

@@ -32,7 +32,7 @@ public function __construct(\Magento\CatalogInventory\Model\Indexer\Stock\Proces
     public function afterImportSource(\Magento\ImportExport\Model\Import $subject, $import)
     {
         if (!$this->_stockndexerProcessor->isIndexerScheduled()) {
-            $this->_stockndexerProcessor->markIndexerAsInvalid();
+            //$this->_stockndexerProcessor->markIndexerAsInvalid();
         }
         return $import;
     }

app/code/Magento/ImportExport/Model/Import.php

@@ -690,7 +690,7 @@ public function invalidateIndex()
                 $indexer = $this->indexerRegistry->get($indexerId);
 
                 if (!$indexer->isScheduled()) {
-                    $indexer->invalidate();
+                    //$indexer->invalidate();
                 }
                 // phpcs:disable Magento2.CodeAnalysis.EmptyBlock.DetectedCatch
             } catch (\InvalidArgumentException $e) {