Avoids indefinite loop of indexers being marked as invalid.

Author: hostep

app/code/Magento/Indexer/Model/Processor.php

@@ -15,6 +15,11 @@
  */
 class Processor
 {
+    /**
+     * @var array
+     */
+    private $sharedIndexesComplete = [];
+
     /**
      * @var ConfigInterface
      */
@@ -60,32 +65,83 @@ public function __construct(
      */
     public function reindexAllInvalid()
     {
-        $sharedIndexesComplete = [];
         foreach (array_keys($this->config->getIndexers()) as $indexerId) {
             /** @var Indexer $indexer */
             $indexer = $this->indexerFactory->create();
             $indexer->load($indexerId);
             $indexerConfig = $this->config->getIndexer($indexerId);
+            $sharedIndex = $indexerConfig['shared_index'];
+
             if ($indexer->isInvalid()) {
                 // Skip indexers having shared index that was already complete
                 $sharedIndex = $indexerConfig['shared_index'] ?? null;
-                if (!in_array($sharedIndex, $sharedIndexesComplete)) {
+                if (!in_array($sharedIndex, $this->sharedIndexesComplete)) {
                     $indexer->reindexAll();
-                } else {
-                    /** @var \Magento\Indexer\Model\Indexer\State $state */
-                    $state = $indexer->getState();
-                    $state->setStatus(StateInterface::STATUS_WORKING);
-                    $state->save();
-                    $state->setStatus(StateInterface::STATUS_VALID);
-                    $state->save();
-                }
-                if ($sharedIndex) {
-                    $sharedIndexesComplete[] = $sharedIndex;
+
+                    if ($sharedIndex) {
+                        $this->validateSharedIndex($sharedIndex);
+                    }
                 }
             }
         }
     }
 
+    /**
+     * Get indexer ids that have common shared index
+     *
+     * @param string $sharedIndex
+     * @return array
+     */
+    private function getIndexerIdsBySharedIndex(string $sharedIndex): array
+    {
+        $indexers = $this->config->getIndexers();
+
+        $result = [];
+        foreach ($indexers as $indexerConfig) {
+            if ($indexerConfig['shared_index'] == $sharedIndex) {
+                $result[] = $indexerConfig['indexer_id'];
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Validate indexers by shared index ID
+     *
+     * @param string $sharedIndex
+     * @return $this
+     */
+    private function validateSharedIndex(string $sharedIndex): self
+    {
+        if (empty($sharedIndex)) {
+            throw new \InvalidArgumentException(
+                'The sharedIndex is an invalid shared index identifier. Verify the identifier and try again.'
+            );
+        }
+
+        $indexerIds = $this->getIndexerIdsBySharedIndex($sharedIndex);
+        if (empty($indexerIds)) {
+            return $this;
+        }
+
+        foreach ($indexerIds as $indexerId) {
+            /** @var \Magento\Indexer\Model\Indexer $indexer */
+            $indexer = $this->indexerFactory->create();
+            $indexer->load($indexerId);
+            /** @var \Magento\Indexer\Model\Indexer\State $state */
+            $state = $indexer->getState();
+            $state->setStatus(StateInterface::STATUS_WORKING);
+            $state->save();
+            $state->setStatus(StateInterface::STATUS_VALID);
+            $state->save();
+        }
+
+        $this->sharedIndexesComplete[] = $sharedIndex;
+
+        return $this;
+    }
+
     /**
      * Regenerate indexes for all indexers
      *

app/code/Magento/Indexer/Test/Unit/Model/ProcessorTest.php

@@ -85,6 +85,14 @@ public function testReindexAllInvalid()
 
         $this->configMock->expects($this->once())->method('getIndexers')->willReturn($indexers);
 
+        $this->configMock->expects($this->exactly(2))
+            ->method('getIndexer')
+            ->willReturn(
+                [
+                    'shared_index' => null
+                ]
+            );
+
         $state1Mock = $this->createPartialMock(State::class, ['getStatus', '__wakeup']);
         $state1Mock->expects(
             $this->once()