From 6606b53679d0822f3d15d046f1317e5546f4a18f Mon Sep 17 00:00:00 2001 From: Aman Khare Date: Mon, 23 Oct 2023 15:57:46 +0530 Subject: [PATCH] Incorporate name change comments Signed-off-by: Aman Khare --- .../opensearch/gateway/GatewayMetaState.java | 2 +- .../remote/RemoteClusterStateService.java | 4 ++-- .../gateway/remote/RemotePersistenceStats.java | 4 ++-- .../GatewayMetaStatePersistedStateTests.java | 6 +++--- .../remote/RemoteClusterStateServiceTests.java | 18 +++++++++--------- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/server/src/main/java/org/opensearch/gateway/GatewayMetaState.java b/server/src/main/java/org/opensearch/gateway/GatewayMetaState.java index c92807f84983b..350a361a49a62 100644 --- a/server/src/main/java/org/opensearch/gateway/GatewayMetaState.java +++ b/server/src/main/java/org/opensearch/gateway/GatewayMetaState.java @@ -731,7 +731,7 @@ assert verifyManifestAndClusterState(lastAcceptedManifest, lastAcceptedState) == @Override public PersistedStateStats getStats() { - return remoteClusterStateService.getRemoteClusterStateStats(); + return remoteClusterStateService.getStats(); } private boolean verifyManifestAndClusterState(ClusterMetadataManifest manifest, ClusterState clusterState) { 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 efe89bd88e68d..74e0c786923cc 100644 --- a/server/src/main/java/org/opensearch/gateway/remote/RemoteClusterStateService.java +++ b/server/src/main/java/org/opensearch/gateway/remote/RemoteClusterStateService.java @@ -1028,7 +1028,7 @@ public static String encodeString(String content) { } public void writeMetadataFailed() { - getRemoteClusterStateStats().stateFailed(); + getStats().stateFailed(); } /** @@ -1236,7 +1236,7 @@ public void deleteStaleClusterUUIDs(ClusterState clusterState, ClusterMetadataMa }); } - public RemotePersistenceStats getRemoteClusterStateStats() { + public RemotePersistenceStats getStats() { return remoteStateStats; } } diff --git a/server/src/main/java/org/opensearch/gateway/remote/RemotePersistenceStats.java b/server/src/main/java/org/opensearch/gateway/remote/RemotePersistenceStats.java index d992223eba742..f2330846fa23e 100644 --- a/server/src/main/java/org/opensearch/gateway/remote/RemotePersistenceStats.java +++ b/server/src/main/java/org/opensearch/gateway/remote/RemotePersistenceStats.java @@ -19,11 +19,11 @@ */ public class RemotePersistenceStats extends PersistedStateStats { static final String CLEANUP_ATTEMPT_FAILED_COUNT = "cleanup_attempt_failed_count"; - static final String REMOTE = "remote"; + static final String REMOTE_UPLOAD = "remote_upload"; private AtomicLong cleanupAttemptFailedCount = new AtomicLong(0); public RemotePersistenceStats() { - super(REMOTE); + super(REMOTE_UPLOAD); addToExtendedFields(CLEANUP_ATTEMPT_FAILED_COUNT, cleanupAttemptFailedCount); } diff --git a/server/src/test/java/org/opensearch/gateway/GatewayMetaStatePersistedStateTests.java b/server/src/test/java/org/opensearch/gateway/GatewayMetaStatePersistedStateTests.java index e83a5faa79225..fd113ed4313d7 100644 --- a/server/src/test/java/org/opensearch/gateway/GatewayMetaStatePersistedStateTests.java +++ b/server/src/test/java/org/opensearch/gateway/GatewayMetaStatePersistedStateTests.java @@ -786,7 +786,7 @@ public void testRemotePersistedStateFailureStats() throws IOException { final RemoteClusterStateService remoteClusterStateService = Mockito.mock(RemoteClusterStateService.class); final String previousClusterUUID = "prev-cluster-uuid"; Mockito.doThrow(IOException.class).when(remoteClusterStateService).writeFullMetadata(Mockito.any(), Mockito.any()); - when(remoteClusterStateService.getRemoteClusterStateStats()).thenReturn(remoteStateStats); + when(remoteClusterStateService.getStats()).thenReturn(remoteStateStats); doCallRealMethod().when(remoteClusterStateService).writeMetadataFailed(); CoordinationState.PersistedState remotePersistedState = new RemotePersistedState(remoteClusterStateService, previousClusterUUID); @@ -797,8 +797,8 @@ public void testRemotePersistedStateFailureStats() throws IOException { ); assertThrows(OpenSearchException.class, () -> remotePersistedState.setLastAcceptedState(clusterState)); - assertEquals(1, remoteClusterStateService.getRemoteClusterStateStats().getFailedCount()); - assertEquals(0, remoteClusterStateService.getRemoteClusterStateStats().getSuccessCount()); + assertEquals(1, remoteClusterStateService.getStats().getFailedCount()); + assertEquals(0, remoteClusterStateService.getStats().getSuccessCount()); } public void testGatewayForRemoteState() throws IOException { 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 3b4aafaed3958..139b1664a544a 100644 --- a/server/src/test/java/org/opensearch/gateway/remote/RemoteClusterStateServiceTests.java +++ b/server/src/test/java/org/opensearch/gateway/remote/RemoteClusterStateServiceTests.java @@ -322,7 +322,7 @@ public void testWriteFullMetadataInParallelFailureForIndexMetadata() throws IOEx RemoteClusterStateService.IndexMetadataTransferException.class, () -> remoteClusterStateService.writeFullMetadata(clusterState, randomAlphaOfLength(10)) ); - assertEquals(0, remoteClusterStateService.getRemoteClusterStateStats().getSuccessCount()); + assertEquals(0, remoteClusterStateService.getStats().getSuccessCount()); } public void testFailWriteIncrementalMetadataNonClusterManagerNode() throws IOException { @@ -330,7 +330,7 @@ public void testFailWriteIncrementalMetadataNonClusterManagerNode() throws IOExc remoteClusterStateService.start(); final ClusterMetadataManifest manifest = remoteClusterStateService.writeIncrementalMetadata(clusterState, clusterState, null); Assert.assertThat(manifest, nullValue()); - assertEquals(0, remoteClusterStateService.getRemoteClusterStateStats().getSuccessCount()); + assertEquals(0, remoteClusterStateService.getStats().getSuccessCount()); } public void testFailWriteIncrementalMetadataWhenTermChanged() { @@ -997,10 +997,10 @@ public void testRemoteStateStats() throws IOException { remoteClusterStateService.start(); final ClusterMetadataManifest manifest = remoteClusterStateService.writeFullMetadata(clusterState, "prev-cluster-uuid"); - assertTrue(remoteClusterStateService.getRemoteClusterStateStats() != null); - assertEquals(1, remoteClusterStateService.getRemoteClusterStateStats().getSuccessCount()); - assertEquals(0, remoteClusterStateService.getRemoteClusterStateStats().getCleanupAttemptFailedCount()); - assertEquals(0, remoteClusterStateService.getRemoteClusterStateStats().getFailedCount()); + assertTrue(remoteClusterStateService.getStats() != null); + assertEquals(1, remoteClusterStateService.getStats().getSuccessCount()); + assertEquals(0, remoteClusterStateService.getStats().getCleanupAttemptFailedCount()); + assertEquals(0, remoteClusterStateService.getStats().getFailedCount()); } public void testRemoteStateCleanupFailureStats() throws IOException { @@ -1014,9 +1014,9 @@ public void testRemoteStateCleanupFailureStats() throws IOException { try { assertBusy(() -> { // wait for stats to get updated - assertTrue(remoteClusterStateService.getRemoteClusterStateStats() != null); - assertEquals(0, remoteClusterStateService.getRemoteClusterStateStats().getSuccessCount()); - assertEquals(1, remoteClusterStateService.getRemoteClusterStateStats().getCleanupAttemptFailedCount()); + assertTrue(remoteClusterStateService.getStats() != null); + assertEquals(0, remoteClusterStateService.getStats().getSuccessCount()); + assertEquals(1, remoteClusterStateService.getStats().getCleanupAttemptFailedCount()); }); } catch (Exception e) { throw new RuntimeException(e);