Merge remote-tracking branch 'origin/MC-30568' into 2.4-develop-pr24

Author: serhii-balko

app/code/Magento/Indexer/Console/Command/IndexerReindexCommand.php

@@ -132,11 +132,11 @@ protected function getIndexers(InputInterface $input)
             $dependentIndexers[] = $this->getDependentIndexerIds($indexer->getId());
         }
 
-        $relatedIndexers = array_merge(...$relatedIndexers);
-        $dependentIndexers = array_merge(...$dependentIndexers);
+        $relatedIndexers = $relatedIndexers ? array_unique(array_merge(...$relatedIndexers)) : [];
+        $dependentIndexers = $dependentIndexers ? array_merge(...$dependentIndexers) : [];
 
         $invalidRelatedIndexers = [];
-        foreach (array_unique($relatedIndexers) as $relatedIndexer) {
+        foreach ($relatedIndexers as $relatedIndexer) {
             if ($allIndexers[$relatedIndexer]->isInvalid()) {
                 $invalidRelatedIndexers[] = $relatedIndexer;
             }
@@ -169,8 +169,9 @@ private function getRelatedIndexerIds(string $indexerId): array
             $relatedIndexerIds[] = [$relatedIndexerId];
             $relatedIndexerIds[] = $this->getRelatedIndexerIds($relatedIndexerId);
         }
+        $relatedIndexerIds = $relatedIndexerIds ? array_unique(array_merge(...$relatedIndexerIds)) : [];
 
-        return array_unique(array_merge(...$relatedIndexerIds));
+        return $relatedIndexerIds;
     }
 
     /**
@@ -189,8 +190,9 @@ private function getDependentIndexerIds(string $indexerId): array
                 $dependentIndexerIds[] = $this->getDependentIndexerIds($id);
             }
         }
+        $dependentIndexerIds = $dependentIndexerIds ? array_unique(array_merge(...$dependentIndexerIds)) : [];
 
-        return array_unique(array_merge(...$dependentIndexerIds));
+        return $dependentIndexerIds;
     }
 
     /**
@@ -251,6 +253,8 @@ private function validateSharedIndex($sharedIndex)
             $indexer = $this->getIndexerRegistry()->get($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();
         }

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

@@ -10,6 +10,9 @@
 use Magento\Framework\Indexer\IndexerInterfaceFactory;
 use Magento\Framework\Indexer\StateInterface;
 
+/**
+ * Indexer processor
+ */
 class Processor
 {
     /**
@@ -70,6 +73,8 @@ public function reindexAllInvalid()
                 } 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();
                 }