From a11a5afaa4037de43ae873e21ba0266fe8c781b0 Mon Sep 17 00:00:00 2001 From: Shivansh Arora Date: Tue, 11 Jun 2024 17:36:55 +0530 Subject: [PATCH] apply spotless Signed-off-by: Shivansh Arora --- .../RemoteClusterStateCleanupManager.java | 21 ++++++++++----- .../remote/RemoteClusterStateService.java | 4 ++- .../remote/RemoteGlobalMetadataManager.java | 1 + .../remote/RemoteIndexMetadataManager.java | 3 ++- .../gateway/remote/RemoteManifestManager.java | 13 +++++----- .../RemoteClusterStateServiceTests.java | 26 +++++++++++++++++-- .../RemoteGlobalMetadataManagerTests.java | 13 +--------- .../RemoteIndexMetadataManagerTests.java | 7 +---- .../remote/RemoteManifestManagerTests.java | 2 -- 9 files changed, 53 insertions(+), 37 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 d65d0583d080e..7cada4075030e 100644 --- a/server/src/main/java/org/opensearch/gateway/remote/RemoteClusterStateCleanupManager.java +++ b/server/src/main/java/org/opensearch/gateway/remote/RemoteClusterStateCleanupManager.java @@ -71,6 +71,7 @@ public class RemoteClusterStateCleanupManager implements Closeable { private long lastCleanupAttemptStateVersion; private final ThreadPool threadpool; private final ClusterApplierService clusterApplierService; + private final RemoteManifestManager remoteManifestManager; public RemoteClusterStateCleanupManager(RemoteClusterStateService remoteClusterStateService, ClusterService clusterService) { this.remoteClusterStateService = remoteClusterStateService; @@ -82,6 +83,7 @@ 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() { @@ -169,8 +171,11 @@ void deleteClusterMetadata( Set staleIndexMetadataPaths = new HashSet<>(); Set staleGlobalMetadataPaths = new HashSet<>(); activeManifestBlobMetadata.forEach(blobMetadata -> { - ClusterMetadataManifest clusterMetadataManifest = remoteClusterStateService.getRemoteManifestManager() - .fetchRemoteClusterMetadataManifest(clusterName, clusterUUID, blobMetadata.name()); + ClusterMetadataManifest clusterMetadataManifest = remoteManifestManager.fetchRemoteClusterMetadataManifest( + clusterName, + clusterUUID, + blobMetadata.name() + ); clusterMetadataManifest.getIndices() .forEach( uploadedIndexMetadata -> filesToKeep.add( @@ -189,11 +194,13 @@ void deleteClusterMetadata( } }); staleManifestBlobMetadata.forEach(blobMetadata -> { - ClusterMetadataManifest clusterMetadataManifest = remoteClusterStateService.getRemoteManifestManager() - .fetchRemoteClusterMetadataManifest(clusterName, clusterUUID, blobMetadata.name()); + ClusterMetadataManifest clusterMetadataManifest = remoteManifestManager.fetchRemoteClusterMetadataManifest( + clusterName, + clusterUUID, + blobMetadata.name() + ); staleManifestPaths.add( - remoteClusterStateService.getRemoteManifestManager().getManifestFolderPath(clusterName, clusterUUID).buildAsString() - + blobMetadata.name() + remoteManifestManager.getManifestFolderPath(clusterName, clusterUUID).buildAsString() + blobMetadata.name() ); if (clusterMetadataManifest.getCodecVersion() == ClusterMetadataManifest.CODEC_V1) { addStaleGlobalMetadataPath(clusterMetadataManifest.getGlobalMetadataFileName(), filesToKeep, staleGlobalMetadataPaths); @@ -258,7 +265,7 @@ void deleteStaleClusterMetadata(String clusterName, String clusterUUID, int mani try { getBlobStoreTransferService().listAllInSortedOrderAsync( ThreadPool.Names.REMOTE_PURGE, - remoteClusterStateService.getRemoteManifestManager().getManifestFolderPath(clusterName, clusterUUID), + remoteManifestManager.getManifestFolderPath(clusterName, clusterUUID), MANIFEST, Integer.MAX_VALUE, new ActionListener<>() { 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 365fc4bc15387..4436ae0a29267 100644 --- a/server/src/main/java/org/opensearch/gateway/remote/RemoteClusterStateService.java +++ b/server/src/main/java/org/opensearch/gateway/remote/RemoteClusterStateService.java @@ -694,7 +694,9 @@ public void start() { remoteGlobalMetadataManager = new RemoteGlobalMetadataManager( clusterSettings, clusterName, - blobStoreRepository, blobStoreTransferService, threadpool + blobStoreRepository, + blobStoreTransferService, + threadpool ); remoteIndexMetadataManager = new RemoteIndexMetadataManager( clusterSettings, diff --git a/server/src/main/java/org/opensearch/gateway/remote/RemoteGlobalMetadataManager.java b/server/src/main/java/org/opensearch/gateway/remote/RemoteGlobalMetadataManager.java index 2b660000420bb..1b6bb54b7c975 100644 --- a/server/src/main/java/org/opensearch/gateway/remote/RemoteGlobalMetadataManager.java +++ b/server/src/main/java/org/opensearch/gateway/remote/RemoteGlobalMetadataManager.java @@ -152,6 +152,7 @@ Metadata getGlobalMetadata(String clusterUUID, ClusterMetadataManifest clusterMe ); return globalMetadataBlobStore.read(remoteGlobalMetadata); } else if (clusterMetadataManifest.hasMetadataAttributesFiles()) { + // from CODEC_V2, we have started uploading all the metadata in granular files instead of a single entity Metadata.Builder builder = new Metadata.Builder(); if (clusterMetadataManifest.getCoordinationMetadata().getUploadedFilename() != null) { RemoteCoordinationMetadata remoteCoordinationMetadata = new RemoteCoordinationMetadata( diff --git a/server/src/main/java/org/opensearch/gateway/remote/RemoteIndexMetadataManager.java b/server/src/main/java/org/opensearch/gateway/remote/RemoteIndexMetadataManager.java index a1fc6301cfafb..80ae33e2bb00c 100644 --- a/server/src/main/java/org/opensearch/gateway/remote/RemoteIndexMetadataManager.java +++ b/server/src/main/java/org/opensearch/gateway/remote/RemoteIndexMetadataManager.java @@ -66,7 +66,8 @@ public RemoteIndexMetadataManager( clusterName, threadpool, ThreadPool.Names.REMOTE_STATE_READ - );; + ); + ; this.namedXContentRegistry = blobStoreRepository.getNamedXContentRegistry(); this.compressor = blobStoreRepository.getCompressor(); this.indexMetadataUploadTimeout = clusterSettings.get(INDEX_METADATA_UPLOAD_TIMEOUT_SETTING); diff --git a/server/src/main/java/org/opensearch/gateway/remote/RemoteManifestManager.java b/server/src/main/java/org/opensearch/gateway/remote/RemoteManifestManager.java index 6d8bf063f768f..86d5a4d1aafb5 100644 --- a/server/src/main/java/org/opensearch/gateway/remote/RemoteManifestManager.java +++ b/server/src/main/java/org/opensearch/gateway/remote/RemoteManifestManager.java @@ -79,12 +79,13 @@ public class RemoteManifestManager { this.metadataManifestUploadTimeout = clusterSettings.get(METADATA_MANIFEST_UPLOAD_TIMEOUT_SETTING); this.nodeId = nodeId; this.manifestBlobStore = new RemoteClusterStateBlobStore<>( - blobStoreTransferService, - blobStoreRepository, - clusterName, - threadpool, - ThreadPool.Names.REMOTE_STATE_READ - );; + blobStoreTransferService, + blobStoreRepository, + clusterName, + threadpool, + ThreadPool.Names.REMOTE_STATE_READ + ); + ; clusterSettings.addSettingsUpdateConsumer(METADATA_MANIFEST_UPLOAD_TIMEOUT_SETTING, this::setMetadataManifestUploadTimeout); this.compressor = blobStoreRepository.getCompressor(); this.namedXContentRegistry = blobStoreRepository.getNamedXContentRegistry(); diff --git a/server/src/test/java/org/opensearch/gateway/remote/RemoteClusterStateServiceTests.java b/server/src/test/java/org/opensearch/gateway/remote/RemoteClusterStateServiceTests.java index 7c35944cca300..c22b325990a41 100644 --- a/server/src/test/java/org/opensearch/gateway/remote/RemoteClusterStateServiceTests.java +++ b/server/src/test/java/org/opensearch/gateway/remote/RemoteClusterStateServiceTests.java @@ -1632,11 +1632,33 @@ private void mockObjectsForGettingPreviousClusterUUID( if (differGlobalMetadata) { mockBlobContainerOrderedList.addAll( - List.of(blobContainer3, blobContainer1, blobContainer3, blobContainer1, blobContainer1, blobContainer1, blobContainer1, blobContainer3, blobContainer3, blobContainer3) + List.of( + blobContainer3, + blobContainer1, + blobContainer3, + blobContainer1, + blobContainer1, + blobContainer1, + blobContainer1, + blobContainer3, + blobContainer3, + blobContainer3 + ) ); } mockBlobContainerOrderedList.addAll( - List.of(blobContainer2, blobContainer1, blobContainer2, blobContainer1, blobContainer1, blobContainer1, blobContainer1, blobContainer2, blobContainer2, blobContainer2) + List.of( + blobContainer2, + blobContainer1, + blobContainer2, + blobContainer1, + blobContainer1, + blobContainer1, + blobContainer1, + blobContainer2, + blobContainer2, + blobContainer2 + ) ); BlobContainer[] mockBlobContainerOrderedArray = new BlobContainer[mockBlobContainerOrderedList.size()]; mockBlobContainerOrderedList.toArray(mockBlobContainerOrderedArray); diff --git a/server/src/test/java/org/opensearch/gateway/remote/RemoteGlobalMetadataManagerTests.java b/server/src/test/java/org/opensearch/gateway/remote/RemoteGlobalMetadataManagerTests.java index a24d5373c061b..07d2c9a40185b 100644 --- a/server/src/test/java/org/opensearch/gateway/remote/RemoteGlobalMetadataManagerTests.java +++ b/server/src/test/java/org/opensearch/gateway/remote/RemoteGlobalMetadataManagerTests.java @@ -9,21 +9,12 @@ package org.opensearch.gateway.remote; import org.opensearch.cluster.ClusterModule; -import org.opensearch.cluster.coordination.CoordinationMetadata; -import org.opensearch.cluster.metadata.Metadata; -import org.opensearch.cluster.metadata.TemplatesMetadata; import org.opensearch.common.network.NetworkModule; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; import org.opensearch.core.compress.Compressor; import org.opensearch.core.compress.NoneCompressor; import org.opensearch.core.xcontent.NamedXContentRegistry; -import org.opensearch.gateway.remote.model.RemoteClusterStateBlobStore; -import org.opensearch.gateway.remote.model.RemoteCoordinationMetadata; -import org.opensearch.gateway.remote.model.RemoteCustomMetadata; -import org.opensearch.gateway.remote.model.RemoteGlobalMetadata; -import org.opensearch.gateway.remote.model.RemotePersistentSettingsMetadata; -import org.opensearch.gateway.remote.model.RemoteTemplatesMetadata; import org.opensearch.index.translog.transfer.BlobStoreTransferService; import org.opensearch.indices.IndicesModule; import org.opensearch.repositories.blobstore.BlobStoreRepository; @@ -37,10 +28,8 @@ import java.util.stream.Stream; import static java.util.stream.Collectors.toList; -import static org.mockito.Mockito.when; -import static org.opensearch.threadpool.ThreadPool.Names.GENERIC; -import static org.opensearch.threadpool.ThreadPool.Names.REMOTE_STATE_READ; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; public class RemoteGlobalMetadataManagerTests extends OpenSearchTestCase { private RemoteGlobalMetadataManager remoteGlobalMetadataManager; diff --git a/server/src/test/java/org/opensearch/gateway/remote/RemoteIndexMetadataManagerTests.java b/server/src/test/java/org/opensearch/gateway/remote/RemoteIndexMetadataManagerTests.java index 1096883db29b6..47bcd0c82b8f6 100644 --- a/server/src/test/java/org/opensearch/gateway/remote/RemoteIndexMetadataManagerTests.java +++ b/server/src/test/java/org/opensearch/gateway/remote/RemoteIndexMetadataManagerTests.java @@ -9,16 +9,12 @@ package org.opensearch.gateway.remote; import org.opensearch.cluster.ClusterModule; -import org.opensearch.cluster.metadata.IndexMetadata; import org.opensearch.common.network.NetworkModule; -import org.opensearch.common.remote.RemoteWritableEntityStore; import org.opensearch.common.settings.ClusterSettings; import org.opensearch.common.settings.Settings; import org.opensearch.core.compress.Compressor; import org.opensearch.core.compress.NoneCompressor; import org.opensearch.core.xcontent.NamedXContentRegistry; -import org.opensearch.gateway.remote.model.RemoteClusterStateBlobStore; -import org.opensearch.gateway.remote.model.RemoteIndexMetadata; import org.opensearch.index.translog.transfer.BlobStoreTransferService; import org.opensearch.indices.IndicesModule; import org.opensearch.repositories.blobstore.BlobStoreRepository; @@ -32,9 +28,8 @@ import java.util.stream.Stream; import static java.util.stream.Collectors.toList; -import static org.mockito.Mockito.when; -import static org.opensearch.threadpool.ThreadPool.Names.REMOTE_STATE_READ; import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; public class RemoteIndexMetadataManagerTests extends OpenSearchTestCase { private RemoteIndexMetadataManager remoteIndexMetadataManager; diff --git a/server/src/test/java/org/opensearch/gateway/remote/RemoteManifestManagerTests.java b/server/src/test/java/org/opensearch/gateway/remote/RemoteManifestManagerTests.java index decfd6a080f60..055bd94f5317b 100644 --- a/server/src/test/java/org/opensearch/gateway/remote/RemoteManifestManagerTests.java +++ b/server/src/test/java/org/opensearch/gateway/remote/RemoteManifestManagerTests.java @@ -19,8 +19,6 @@ import org.opensearch.core.compress.Compressor; import org.opensearch.core.compress.NoneCompressor; import org.opensearch.core.xcontent.NamedXContentRegistry; -import org.opensearch.gateway.remote.model.RemoteClusterMetadataManifest; -import org.opensearch.gateway.remote.model.RemoteClusterStateBlobStore; import org.opensearch.index.translog.transfer.BlobStoreTransferService; import org.opensearch.indices.IndicesModule; import org.opensearch.repositories.blobstore.BlobStoreRepository;