MAGE-1218 Fix replica sync enablement check

Author: cammonro

Service/Product/ReplicaManager.php

@@ -470,7 +470,7 @@ function($replica) use ($replicas) {
      */
     public function isReplicaSyncEnabled(int $storeId): bool
     {
-        return $this->configHelper->isInstantEnabled($storeId);
+        return $this->configHelper->isInstantEnabled($storeId) && $this->configHelper->isEnabledBackend($storeId);
     }
 
     /**

Setup/Patch/Data/RebuildReplicasPatch.php

@@ -67,10 +67,13 @@ public function apply(): PatchInterface
             // Area code is already set - nothing to do
         }
 
-        $storeIds = array_keys($this->storeManager->getStores());
-        // Delete all replicas before resyncing in case of incorrect replica assignments
+        $storeIds = array_filter(
+            array_keys($this->storeManager->getStores()),
+            function (int $storeId) { return $this->replicaManager->isReplicaSyncEnabled($storeId); }
+        );
 
         try {
+            // Delete all replicas before resyncing in case of incorrect replica assignments
             foreach ($storeIds as $storeId) {
                 $this->retryDeleteReplica($storeId);
             }
@@ -81,7 +84,8 @@ public function apply(): PatchInterface
             }
         }
         catch (AlgoliaException $e) {
-            $this->logger->error("Could not rebuild replicas - a full reindex will be required.");
+            // Log the error but do not prevent setup:update
+            $this->logger->error("Could not rebuild replicas - a full reindex may be required.");
         }
 
         $this->moduleDataSetup->getConnection()->endSetup();

Test/Integration/Product/ReplicaIndexingTest.php

@@ -172,15 +172,10 @@ protected function mockSortUpdate(string $sortAttr, string $sortDir, array $attr
      */
     public function testReplicaRebuild(): void
     {
-        $primaryIndexName = $this->getIndexName('default');
-
+        // Make one replica virtual
         $this->mockSortUpdate('price', 'desc', ['virtualReplica' => 1]);
-        $sorting = $this->objectManager->get(\Algolia\AlgoliaSearch\Service\Product\SortingTransformer::class)->getSortingIndices(1, null, null, true);
 
-        $syncCmd = $this->objectManager->get(\Algolia\AlgoliaSearch\Console\Command\ReplicaSyncCommand::class);
-        $this->mockProperty($syncCmd, 'output', \Symfony\Component\Console\Output\OutputInterface::class);
-        $syncCmd->syncReplicas();
-        $this->algoliaHelper->waitLastTask();
+        $sorting = $this->populateReplicas(1);
 
         $rebuildCmd = $this->objectManager->get(\Algolia\AlgoliaSearch\Console\Command\ReplicaRebuildCommand::class);
         $this->invokeMethod(
@@ -193,12 +188,9 @@ public function testReplicaRebuild(): void
         );
         $this->algoliaHelper->waitLastTask();
 
-        $currentSettings = $this->algoliaHelper->getSettings($primaryIndexName);
-        $this->assertArrayHasKey('replicas', $currentSettings);
-        $replicas = $currentSettings['replicas'];
+        $replicas = $this->assertReplicasCreated($sorting);
 
-        $this->assertEquals(count($sorting), count($replicas));
-        $this->assertSortToReplicaConfigParity($primaryIndexName, $sorting, $replicas);
+        $this->assertSortToReplicaConfigParity($this->indexName, $sorting, $replicas);
     }
 
     /**
@@ -209,17 +201,33 @@ public function testReplicaRebuild(): void
      */
     public function testReplicaSync(): void
     {
-        $primaryIndexName = $this->indexName;
-
         // Make one replica virtual
         $this->mockSortUpdate('created_at', 'desc', ['virtualReplica' => 1]);
 
         $sorting = $this->populateReplicas(1);
 
         $replicas = $this->assertReplicasCreated($sorting);
 
-        $this->assertEquals(count($sorting), count($replicas));
-        $this->assertSortToReplicaConfigParity($primaryIndexName, $sorting, $replicas);
+        $this->assertSortToReplicaConfigParity($this->indexName, $sorting, $replicas);
+    }
+
+    /**
+     * @magentoConfigFixture current_store algoliasearch_credentials/credentials/enable_backend 0
+     * @magentoConfigFixture current_store algoliasearch_instant/instant/is_instant_enabled 1
+     * @throws AlgoliaException
+     * @throws ExceededRetriesException
+     * @throws \ReflectionException
+     */
+    public function testReplicaSyncDisabled(): void
+    {
+        $primaryIndexName = $this->indexName;
+        $settings = $this->algoliaHelper->getSettings($this->indexName);
+        $this->assertArrayNotHasKey(ReplicaManager::ALGOLIA_SETTINGS_KEY_REPLICAS, $settings);
+
+        $this->populateReplicas(1);
+
+        $newSettings = $this->algoliaHelper->getSettings($this->indexName);
+        $this->assertArrayNotHasKey(ReplicaManager::ALGOLIA_SETTINGS_KEY_REPLICAS, $newSettings);
     }
 
     /**
@@ -252,14 +260,17 @@ public function testReplicaDeleteUnreliable(): void
 
     /**
      * Test the RebuildReplicasPatch with API failures
+     * @magentoConfigFixture current_store algoliasearch_credentials/credentials/enable_backend 1
      * @magentoConfigFixture current_store algoliasearch_instant/instant/is_instant_enabled 1
      */
     public function testReplicaRebuildPatch(): void
     {
-        $sorting = $this->populateReplicas(1);
-        $replicas = $this->assertReplicasCreated($sorting);
-
+        $currentStoreId = 1;
         $this->assertTrue($this->configHelper->credentialsAreConfigured(), "Credentials not available to apply patch.");
+        $this->assertTrue($this->replicaManager->isReplicaSyncEnabled($currentStoreId), "Replica sync is not enabled for test store $currentStoreId.");
+
+        $sorting = $this->populateReplicas($currentStoreId);
+        $replicas = $this->assertReplicasCreated($sorting);
 
         $patch = new \Algolia\AlgoliaSearch\Setup\Patch\Data\RebuildReplicasPatch(
             $this->objectManager->get(ModuleDataSetupInterface::class),
@@ -275,7 +286,9 @@ public function testReplicaRebuildPatch(): void
         $patch->apply();
 
         $this->algoliaHelper->waitLastTask();
-        $this->assertEquals(count($sorting), count($replicas));
+
+        $replicas = $this->assertReplicasCreated($sorting);
+
         $this->assertSortToReplicaConfigParity($this->indexName, $sorting, $replicas);
     }