From 5697fab7e0a0d2d1c467e27ffa049ef299eb0c3a Mon Sep 17 00:00:00 2001
From: Shivansh Arora <hishiv@amazon.com>
Date: Tue, 11 Jun 2024 20:42:03 +0530
Subject: [PATCH] Address build failure

Signed-off-by: Shivansh Arora <hishiv@amazon.com>
---
 .../gateway/remote/RemoteClusterStateCleanupManager.java      | 4 ++--
 .../opensearch/gateway/remote/RemoteClusterStateService.java  | 2 +-
 .../opensearch/gateway/remote/model/RemoteIndexMetadata.java  | 2 +-
 .../gateway/remote/RemoteClusterStateCleanupManagerTests.java | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/server/src/main/java/org/opensearch/gateway/remote/RemoteClusterStateCleanupManager.java b/server/src/main/java/org/opensearch/gateway/remote/RemoteClusterStateCleanupManager.java
index 7cada4075030e..d8e2d38c54b7d 100644
--- a/server/src/main/java/org/opensearch/gateway/remote/RemoteClusterStateCleanupManager.java
+++ b/server/src/main/java/org/opensearch/gateway/remote/RemoteClusterStateCleanupManager.java
@@ -71,7 +71,7 @@ public class RemoteClusterStateCleanupManager implements Closeable {
     private long lastCleanupAttemptStateVersion;
     private final ThreadPool threadpool;
     private final ClusterApplierService clusterApplierService;
-    private final RemoteManifestManager remoteManifestManager;
+    private RemoteManifestManager remoteManifestManager;
 
     public RemoteClusterStateCleanupManager(RemoteClusterStateService remoteClusterStateService, ClusterService clusterService) {
         this.remoteClusterStateService = remoteClusterStateService;
@@ -83,11 +83,11 @@ public RemoteClusterStateCleanupManager(RemoteClusterStateService remoteClusterS
         // initialize with 0, a cleanup will be done when this node is elected master node and version is incremented more than threshold
         this.lastCleanupAttemptStateVersion = 0;
         clusterSettings.addSettingsUpdateConsumer(REMOTE_CLUSTER_STATE_CLEANUP_INTERVAL_SETTING, this::updateCleanupInterval);
-        remoteManifestManager = remoteClusterStateService.getRemoteManifestManager();
     }
 
     void start() {
         staleFileDeletionTask = new AsyncStaleFileDeletion(this);
+        remoteManifestManager = remoteClusterStateService.getRemoteManifestManager();
     }
 
     @Override
diff --git a/server/src/main/java/org/opensearch/gateway/remote/RemoteClusterStateService.java b/server/src/main/java/org/opensearch/gateway/remote/RemoteClusterStateService.java
index 1c2c1abe0b02a..af87d06cfcb9f 100644
--- a/server/src/main/java/org/opensearch/gateway/remote/RemoteClusterStateService.java
+++ b/server/src/main/java/org/opensearch/gateway/remote/RemoteClusterStateService.java
@@ -682,7 +682,6 @@ public void start() {
         final Repository repository = repositoriesService.get().repository(remoteStoreRepo);
         assert repository instanceof BlobStoreRepository : "Repository should be instance of BlobStoreRepository";
         blobStoreRepository = (BlobStoreRepository) repository;
-        remoteClusterStateCleanupManager.start();
         this.remoteRoutingTableService.start();
         blobStoreTransferService = new BlobStoreTransferService(getBlobStore(), threadpool);
         String clusterName = ClusterName.CLUSTER_NAME_SETTING.get(settings).value();
@@ -709,6 +708,7 @@ public void start() {
             blobStoreTransferService,
             threadpool
         );
+        remoteClusterStateCleanupManager.start();
     }
 
     private void setSlowWriteLoggingThreshold(TimeValue slowWriteLoggingThreshold) {
diff --git a/server/src/main/java/org/opensearch/gateway/remote/model/RemoteIndexMetadata.java b/server/src/main/java/org/opensearch/gateway/remote/model/RemoteIndexMetadata.java
index 3acbcf545563c..830b09b92e2cb 100644
--- a/server/src/main/java/org/opensearch/gateway/remote/model/RemoteIndexMetadata.java
+++ b/server/src/main/java/org/opensearch/gateway/remote/model/RemoteIndexMetadata.java
@@ -31,7 +31,7 @@
  */
 public class RemoteIndexMetadata extends AbstractRemoteWritableBlobEntity<IndexMetadata> {
 
-    public static final int INDEX_METADATA_CURRENT_CODEC_VERSION = 1;
+    public static final int INDEX_METADATA_CURRENT_CODEC_VERSION = 2;
 
     public static final ChecksumBlobStoreFormat<IndexMetadata> INDEX_METADATA_FORMAT = new ChecksumBlobStoreFormat<>(
         "index-metadata",
diff --git a/server/src/test/java/org/opensearch/gateway/remote/RemoteClusterStateCleanupManagerTests.java b/server/src/test/java/org/opensearch/gateway/remote/RemoteClusterStateCleanupManagerTests.java
index 397c168eb6918..29b5007c22312 100644
--- a/server/src/test/java/org/opensearch/gateway/remote/RemoteClusterStateCleanupManagerTests.java
+++ b/server/src/test/java/org/opensearch/gateway/remote/RemoteClusterStateCleanupManagerTests.java
@@ -219,7 +219,7 @@ public void testDeleteClusterMetadata() throws IOException {
         BlobContainer container = mock(BlobContainer.class);
         when(blobStore.blobContainer(any())).thenReturn(container);
         doNothing().when(container).deleteBlobsIgnoringIfNotExists(any());
-
+        remoteClusterStateCleanupManager.start();
         remoteClusterStateCleanupManager.deleteClusterMetadata(clusterName, clusterUUID, activeBlobs, inactiveBlobs);
         verify(container).deleteBlobsIgnoringIfNotExists(
             List.of(