diff --git a/server/src/main/java/org/opensearch/cluster/decommission/DecommissionController.java b/server/src/main/java/org/opensearch/cluster/decommission/DecommissionController.java index 686c73c348ee8..69644ee39a009 100644 --- a/server/src/main/java/org/opensearch/cluster/decommission/DecommissionController.java +++ b/server/src/main/java/org/opensearch/cluster/decommission/DecommissionController.java @@ -231,7 +231,8 @@ public ClusterState execute(ClusterState currentState) throws Exception { // For failures, we update it no matter what int previousStage = decommissionAttributeMetadata.status().stage(); int expectedStage = decommissionStatus.stage(); - logger.info("attempting to update current decommission status [{}] with expected status [{}]", + logger.info( + "attempting to update current decommission status [{}] with expected status [{}]", decommissionAttributeMetadata.status().stage(), decommissionStatus ); diff --git a/server/src/main/java/org/opensearch/cluster/decommission/DecommissionService.java b/server/src/main/java/org/opensearch/cluster/decommission/DecommissionService.java index abe9c7703032e..67ddd722a4047 100644 --- a/server/src/main/java/org/opensearch/cluster/decommission/DecommissionService.java +++ b/server/src/main/java/org/opensearch/cluster/decommission/DecommissionService.java @@ -131,7 +131,7 @@ public ClusterState execute(ClusterState currentState) throws Exception { DecommissionAttributeMetadata decommissionAttributeMetadata = metadata.custom(DecommissionAttributeMetadata.TYPE); // check if the same attribute is requested for decommission and currently not FAILED, // then return the current state as is; as we don't need a state update here - if(isSameNonFailedRequest(decommissionAttributeMetadata, decommissionAttribute)) { + if (isSameNonFailedRequest(decommissionAttributeMetadata, decommissionAttribute)) { logger.info("re-request received for decommissioning [{}], will not update state", decommissionAttribute); return currentState; } @@ -406,7 +406,8 @@ private static void ensureNoConflictingInflightRequest( private static boolean isSameNonFailedRequest( DecommissionAttributeMetadata decommissionAttributeMetadata, - DecommissionAttribute decommissionAttribute) { + DecommissionAttribute decommissionAttribute + ) { return decommissionAttributeMetadata != null && decommissionAttributeMetadata.decommissionAttribute().equals(decommissionAttribute) && !decommissionAttributeMetadata.status().equals(DecommissionStatus.FAILED); diff --git a/server/src/test/java/org/opensearch/cluster/decommission/DecommissionServiceTests.java b/server/src/test/java/org/opensearch/cluster/decommission/DecommissionServiceTests.java index 5f38a6e71f27c..e93be1bea1282 100644 --- a/server/src/test/java/org/opensearch/cluster/decommission/DecommissionServiceTests.java +++ b/server/src/test/java/org/opensearch/cluster/decommission/DecommissionServiceTests.java @@ -41,7 +41,6 @@ import static java.util.Collections.emptySet; import static java.util.Collections.singletonMap; -import static org.mockito.Mockito.mock; import static org.opensearch.cluster.ClusterState.builder; import static org.opensearch.cluster.OpenSearchAllocationTestCase.createAllocationService; import static org.opensearch.test.ClusterServiceUtils.createClusterService; @@ -151,8 +150,13 @@ public void onResponse(ClusterStateUpdateResponse clusterStateUpdateResponse) { @Override public void onFailure(Exception e) { assertTrue(e instanceof DecommissioningFailedException); - assertThat(e.getMessage(), Matchers.endsWith("invalid awareness attribute value requested for decommissioning. " + - "Set forced awareness values before to decommission")); + assertThat( + e.getMessage(), + Matchers.endsWith( + "invalid awareness attribute value requested for decommissioning. " + + "Set forced awareness values before to decommission" + ) + ); countDownLatch.countDown(); } };