From f2ae040613f3d8fe7e887e5dc3eaeb02fa1a865c Mon Sep 17 00:00:00 2001
From: Sooraj Sinha <soosinha@amazon.com>
Date: Fri, 14 Jun 2024 14:53:28 +0530
Subject: [PATCH] use try with resources

Signed-off-by: Sooraj Sinha <soosinha@amazon.com>
---
 .../gateway/remote/RemoteClusterStateAttributesManager.java   | 2 +-
 .../opensearch/gateway/remote/RemoteClusterStateService.java  | 2 +-
 .../gateway/remote/model/RemoteClusterStateBlobStore.java     | 4 +++-
 3 files changed, 5 insertions(+), 3 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
index 9aefbac01cf6c..30dc281e3ae40 100644
--- a/server/src/main/java/org/opensearch/gateway/remote/RemoteClusterStateAttributesManager.java
+++ b/server/src/main/java/org/opensearch/gateway/remote/RemoteClusterStateAttributesManager.java
@@ -143,7 +143,7 @@ public DiffableUtils.MapDiff<String, ClusterState.Custom, Map<String, ClusterSta
             );
         }
         if (firstUploadForEphemeralMetadata) {
-            // For first split global metadata upload, we want to upload all customs
+            // For first upload of ephemeral metadata, we want to upload all customs
             return DiffableUtils.diff(
                 Collections.emptyMap(),
                 clusterState.customs(),
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 a8ea660ec2d76..f07fce563bc64 100644
--- a/server/src/main/java/org/opensearch/gateway/remote/RemoteClusterStateService.java
+++ b/server/src/main/java/org/opensearch/gateway/remote/RemoteClusterStateService.java
@@ -292,7 +292,7 @@ public RemoteClusterStateManifestInfo writeIncrementalMetadata(
         assert previousClusterState.metadata().coordinationMetadata().term() == clusterState.metadata().coordinationMetadata().term();
 
         boolean firstUploadForSplitGlobalMetadata = !previousManifest.hasMetadataAttributesFiles();
-        boolean firstUploadForEphemeralMetadata = previousManifest.getDiscoveryNodesMetadata() != null;
+        boolean firstUploadForEphemeralMetadata = previousManifest.getDiscoveryNodesMetadata() == null;
 
         final DiffableUtils.MapDiff<String, Metadata.Custom, Map<String, Metadata.Custom>> customsDiff = remoteGlobalMetadataManager
             .getCustomsDiff(clusterState, previousClusterState, firstUploadForSplitGlobalMetadata, isPublicationEnabled);
diff --git a/server/src/main/java/org/opensearch/gateway/remote/model/RemoteClusterStateBlobStore.java b/server/src/main/java/org/opensearch/gateway/remote/model/RemoteClusterStateBlobStore.java
index 83326f65f0d43..1dd23443f1252 100644
--- a/server/src/main/java/org/opensearch/gateway/remote/model/RemoteClusterStateBlobStore.java
+++ b/server/src/main/java/org/opensearch/gateway/remote/model/RemoteClusterStateBlobStore.java
@@ -72,7 +72,9 @@ public void writeAsync(final U entity, final ActionListener<Void> listener) {
     public T read(final U entity) throws IOException {
         // TODO Add timing logs and tracing
         assert entity.getFullBlobName() != null;
-        return entity.deserialize(transferService.downloadBlob(getBlobPathForDownload(entity), entity.getBlobFileName()));
+        try (InputStream inputStream = transferService.downloadBlob(getBlobPathForDownload(entity), entity.getBlobFileName())) {
+            return entity.deserialize(inputStream);
+        }
     }
 
     @Override