Fix partial cache update post snapshot restore

Signed-off-by: Nagaraj G <[email protected]>

Author: Nagaraj G

CHANGELOG.md

@@ -26,6 +26,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 * Provide SecureHttpTransportParameters to complement SecureTransportParameters counterpart ([#5432](https://github.com/opensearch-project/security/pull/5432))
 * Use isClusterPerm instead of requestedResolved.isLocalAll() to determine if action is a cluster action ([#5445](https://github.com/opensearch-project/security/pull/5445))
 * Fix config update with deprecated config types failing in mixed clusters ([#5456](https://github.com/opensearch-project/security/pull/5456))
+* Fix partial cache update post snapshot restore[#5478](https://github.com/opensearch-project/security/pull/5478)
 
 ### Refactoring
 

src/main/java/org/opensearch/security/configuration/ConfigurationRepository.java

@@ -681,11 +681,10 @@ public void afterIndexShardStarted(IndexShard indexShard) {
 
         // Check if this is a security index shard
         if (securityIndex.equals(index.getName())) {
-            // Only trigger on primary shard to avoid multiple reloads
-            if (indexShard.routingEntry() != null && indexShard.routingEntry().primary()) {
+            if (indexShard.routingEntry() != null) {
                 threadPool.generic().execute(() -> {
                     if (isSecurityIndexRestoredFromSnapshot(clusterService, index, securityIndex)) {
-                        LOGGER.info("Security index primary shard {} started - config reloading for snapshot restore", shardId);
+                        LOGGER.info("Security index shard {} started - config reloading for snapshot restore", shardId);
                         reloadConfiguration(CType.values());
                     }
                 });

src/test/java/org/opensearch/security/configuration/ConfigurationRepositoryTest.java

@@ -616,15 +616,7 @@ public void afterIndexShardStarted_whenSecurityIndexUpdated() throws Interrupted
         when(mockClusterState.custom(RestoreInProgress.TYPE)).thenReturn(mockRestore);
         when(threadPool.generic()).thenReturn(executorService);
 
-        // when replica shard updated
-        when(shardRouting.primary()).thenReturn(false);
-        configurationRepository.afterIndexShardStarted(indexShard);
-        verify(executorService, never()).execute(any());
-        verify(configurationRepository, never()).reloadConfiguration(any());
-
-        // when primary shard updated
         doReturn(true).when(configurationRepository).reloadConfiguration(any());
-        when(shardRouting.primary()).thenReturn(true);
         when(mockRestore.iterator()).thenReturn(Collections.singletonList(mockEntry).iterator());
         when(mockEntry.indices()).thenReturn(Collections.singletonList(ConfigConstants.OPENDISTRO_SECURITY_DEFAULT_CONFIG_INDEX));
         ArgumentCaptor<Runnable> successRunnableCaptor = ArgumentCaptor.forClass(Runnable.class);
@@ -637,7 +629,6 @@ public void afterIndexShardStarted_whenSecurityIndexUpdated() throws Interrupted
         Mockito.reset(configurationRepository, executorService);
         ArgumentCaptor<Runnable> errorRunnableCaptor = ArgumentCaptor.forClass(Runnable.class);
         when(clusterService.state()).thenThrow(new RuntimeException("ClusterState exception"));
-        when(shardRouting.primary()).thenReturn(true);
         configurationRepository.afterIndexShardStarted(indexShard);
         verify(executorService).execute(errorRunnableCaptor.capture());
         errorRunnableCaptor.getValue().run();