Add more assertions

Signed-off-by: Sooraj Sinha <soosinha@amazon.com>
opensearch-project · Jun 16, 2024 · d61fe23 · d61fe23
1 parent f2ae040
commit d61fe23
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 13 deletions.
diff --git a/server/src/main/java/org/opensearch/gateway/remote/RemoteClusterStateAttributesManager.java b/server/src/main/java/org/opensearch/gateway/remote/RemoteClusterStateAttributesManager.java
@@ -130,11 +130,11 @@ public CheckedRunnable<IOException> getAsyncMetadataReadAction(
     public DiffableUtils.MapDiff<String, ClusterState.Custom, Map<String, ClusterState.Custom>> getUpdatedCustoms(
         ClusterState clusterState,
         ClusterState previousClusterState,
-        boolean includeEphemeral,
+        boolean isWriteFull,
         boolean firstUploadForEphemeralMetadata
     ) {
-        if (!includeEphemeral) {
-            // When includeEphemeral is false, we do not want store any custom objects
+        if (!isWriteFull) {
+            // When isWriteFull is false, we do not want store any custom objects
             return DiffableUtils.diff(
                 Collections.emptyMap(),
                 Collections.emptyMap(),

diff --git a/...src/test/java/org/opensearch/gateway/remote/RemoteClusterStateAttributesManagerTests.java b/...src/test/java/org/opensearch/gateway/remote/RemoteClusterStateAttributesManagerTests.java
@@ -8,9 +8,6 @@
 
 package org.opensearch.gateway.remote;
 
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
 import org.opensearch.Version;
 import org.opensearch.action.LatchedActionListener;
 import org.opensearch.cluster.AbstractNamedDiffable;
@@ -43,6 +40,9 @@
 import org.junit.Before;
 
 import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -53,11 +53,11 @@
 import static org.opensearch.gateway.remote.model.RemoteClusterBlocksTests.randomClusterBlocks;
 import static org.opensearch.gateway.remote.model.RemoteDiscoveryNodes.DISCOVERY_NODES_FORMAT;
 import static org.opensearch.gateway.remote.model.RemoteDiscoveryNodesTests.getDiscoveryNodes;
+import static org.hamcrest.Matchers.is;
 import static org.mockito.ArgumentMatchers.anyIterable;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
-import static org.hamcrest.Matchers.is;
 
 public class RemoteClusterStateAttributesManagerTests extends OpenSearchTestCase {
     private RemoteClusterStateAttributesManager remoteClusterStateAttributesManager;

diff --git a/server/src/test/java/org/opensearch/gateway/remote/RemoteClusterStateServiceTests.java b/server/src/test/java/org/opensearch/gateway/remote/RemoteClusterStateServiceTests.java
@@ -179,10 +179,6 @@ public void setup() {
         when(repositoriesService.repository("routing_repository")).thenReturn(blobStoreRepository);
 
         when(blobStoreRepository.getNamedXContentRegistry()).thenReturn(xContentRegistry);
-        // TODO Make the publication flag parameterized
-        publicationEnabled = true;
-        Settings nodeSettings = Settings.builder().put(REMOTE_PUBLICATION_EXPERIMENTAL, publicationEnabled).build();
-        FeatureFlags.initializeFeatureFlags(nodeSettings);
         remoteClusterStateService = new RemoteClusterStateService(
             "test-node-id",
             repositoriesServiceSupplier,
@@ -199,6 +195,9 @@ public void setup() {
     public void teardown() throws Exception {
         super.tearDown();
         remoteClusterStateService.close();
+        publicationEnabled = false;
+        Settings nodeSettings = Settings.builder().build();
+        FeatureFlags.initializeFeatureFlags(nodeSettings);
         threadPool.shutdown();
     }
 
@@ -272,9 +271,28 @@ public void testWriteFullMetadataSuccess() throws IOException {
         assertThat(manifest.getSettingsMetadata(), notNullValue());
         assertThat(manifest.getTemplatesMetadata(), notNullValue());
         assertFalse(manifest.getCustomMetadataMap().isEmpty());
+        assertThat(manifest.getClusterBlocksMetadata(), nullValue());
+        assertThat(manifest.getDiscoveryNodesMetadata(), nullValue());
+        assertThat(manifest.getTransientSettingsMetadata(), nullValue());
+        assertThat(manifest.getHashesOfConsistentSettings(), nullValue());
+        assertThat(manifest.getClusterStateCustomMap().size(), is(0));
     }
 
     public void testWriteFullMetadataSuccessPublicationEnabled() throws IOException {
+        // TODO Make the publication flag parameterized
+        publicationEnabled = true;
+        Settings nodeSettings = Settings.builder().put(REMOTE_PUBLICATION_EXPERIMENTAL, publicationEnabled).build();
+        FeatureFlags.initializeFeatureFlags(nodeSettings);
+        remoteClusterStateService = new RemoteClusterStateService(
+            "test-node-id",
+            repositoriesServiceSupplier,
+            settings,
+            clusterService,
+            () -> 0L,
+            threadPool,
+            List.of(new RemoteIndexPathUploader(threadPool, settings, repositoriesServiceSupplier, clusterSettings)),
+            writableRegistry()
+        );
         final ClusterState clusterState = generateClusterStateWithOneIndex().nodes(nodesWithLocalNodeClusterManager())
             .customs(Map.of(RepositoryCleanupInProgress.TYPE, new RepositoryCleanupInProgress(List.of(new Entry("test-repo", 10L)))))
             .build();
@@ -358,8 +376,8 @@ public void testWriteFullMetadataInParallelSuccess() throws IOException {
         assertThat(manifest.getStateUUID(), is(expectedManifest.getStateUUID()));
         assertThat(manifest.getPreviousClusterUUID(), is(expectedManifest.getPreviousClusterUUID()));
 
-        assertEquals(12, actionListenerArgumentCaptor.getAllValues().size());
-        assertEquals(12, writeContextArgumentCaptor.getAllValues().size());
+        assertEquals(7, actionListenerArgumentCaptor.getAllValues().size());
+        assertEquals(7, writeContextArgumentCaptor.getAllValues().size());
 
         byte[] writtenBytes = capturedWriteContext.get("metadata")
             .getStreamProvider(Integer.MAX_VALUE)