MAGE-848 Force ReplicaState change on rebuilds

Author: cammonro

Console/Command/ReplicaRebuildCommand.php

@@ -10,8 +10,9 @@
 use Algolia\AlgoliaSearch\Exception\ReplicaLimitExceededException;
 use Algolia\AlgoliaSearch\Exceptions\BadRequestException;
 use Algolia\AlgoliaSearch\Helper\Entity\ProductHelper;
+use Algolia\AlgoliaSearch\Registry\ReplicaState;
 use Algolia\AlgoliaSearch\Service\StoreNameFetcher;
-use Magento\Framework\App\State;
+use Magento\Framework\App\State as AppState;
 use Magento\Framework\Console\Cli;
 use Magento\Store\Model\StoreManagerInterface;
 use Symfony\Component\Console\Input\InputInterface;
@@ -28,12 +29,13 @@ public function __construct(
         protected ProductHelper           $productHelper,
         protected ReplicaManagerInterface $replicaManager,
         protected StoreManagerInterface   $storeManager,
-        State                             $state,
+        protected ReplicaState            $replicaState,
+        AppState                          $appState,
         StoreNameFetcher                  $storeNameFetcher,
         ?string                           $name = null
     )
     {
-        parent::__construct($state, $storeNameFetcher, $name);
+        parent::__construct($appState, $storeNameFetcher, $name);
     }
 
     protected function getReplicaCommandName(): string
@@ -66,6 +68,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $output->writeln($this->decorateOperationAnnouncementMessage('Rebuilding replicas for {{target}}', $storeIds));
 
         $this->deleteReplicas($storeIds);
+        $this->forceState($storeIds);
+
         try {
             $this->syncReplicas($storeIds);
         } catch (ReplicaLimitExceededException $e) {
@@ -83,4 +87,20 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         return Cli::RETURN_SUCCESS;
     }
 
+    /**
+     * Force the replica change state to always sync the replica configuration
+     * Also serves to avoid latency from Algolia API when reading replica configuration for comparison with local Magento config
+     * @param int[] $storeIds
+     * @return void
+     */
+    protected function forceState(array $storeIds): void
+    {
+        if (!count($storeIds)) {
+            $storeIds = array_keys($this->storeManager->getStores());
+        }
+        foreach ($storeIds as $storeId) {
+            $this->replicaState->setChangeState(ReplicaState::REPLICA_STATE_CHANGED, $storeId);
+        }
+    }
+
 }

Service/Product/ReplicaManager.php

@@ -351,13 +351,17 @@ protected function getBareIndexNameFromReplicaSetting(string $replicaSetting): s
 
     /**
      * @param array $replicasToDelete
+     * @param bool $waitLastTask
      * @return void
      * @throws AlgoliaException
      */
-    protected function deleteIndices(array $replicasToDelete): void
+    protected function deleteIndices(array $replicasToDelete, bool $waitLastTask = false): void
     {
         foreach ($replicasToDelete as $deletedReplica) {
             $this->algoliaHelper->deleteIndex($deletedReplica);
+            if ($waitLastTask) {
+                $this->algoliaHelper->waitLastTask($deletedReplica);
+            }
         }
     }
 

Setup/Patch/Data/RebuildReplicasPatch.php

@@ -3,8 +3,9 @@
 namespace Algolia\AlgoliaSearch\Setup\Patch\Data;
 
 use Algolia\AlgoliaSearch\Helper\Entity\ProductHelper;
+use Algolia\AlgoliaSearch\Registry\ReplicaState;
 use Algolia\AlgoliaSearch\Service\Product\ReplicaManager;
-use Magento\Framework\App\State;
+use Magento\Framework\App\State as AppState;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Framework\Setup\Patch\DataPatchInterface;
 use Magento\Framework\Setup\Patch\PatchInterface;
@@ -17,7 +18,8 @@ public function __construct(
         protected StoreManagerInterface    $storeManager,
         protected ReplicaManager           $replicaManager,
         protected ProductHelper            $productHelper,
-        protected State                    $state
+        protected AppState                 $appState,
+        protected ReplicaState             $replicaState
     )
     {}
 
@@ -45,14 +47,16 @@ public function getAliases(): array
     public function apply(): PatchInterface
     {
         $this->moduleDataSetup->getConnection()->startSetup();
-        $this->state->setAreaCode(\Magento\Framework\App\Area::AREA_ADMINHTML);
+        $this->appState->setAreaCode(\Magento\Framework\App\Area::AREA_ADMINHTML);
 
         $storeIds = array_keys($this->storeManager->getStores());
         // Delete all replicas before resyncing in case of incorrect replica assignments
         foreach ($storeIds as $storeId) {
             $this->replicaManager->deleteReplicasFromAlgolia($storeId);
         }
+
         foreach ($storeIds as $storeId) {
+            $this->replicaState->setChangeState(ReplicaState::REPLICA_STATE_CHANGED, $storeId); // avoids latency
             $this->replicaManager->syncReplicasToAlgolia($storeId, $this->productHelper->getIndexSettings($storeId));
         }