From 90bd4ba23bb8e4fa893574256c4681dc21d733a6 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Wed, 24 Mar 2021 12:53:32 +0530 Subject: [PATCH] Revert "plugins: Add 'break' at RedifshClient request re-try loop (#4846)" (#4861) This reverts commit 96dd7280f69f940c077e27fdca67263f24f9c4c9. --- .../utils/redfish/RedfishClient.java | 3 +-- .../utils/redfish/RedfishClientTest.java | 22 ------------------- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/utils/src/main/java/org/apache/cloudstack/utils/redfish/RedfishClient.java b/utils/src/main/java/org/apache/cloudstack/utils/redfish/RedfishClient.java index 32b4f383e94..8b211c02606 100644 --- a/utils/src/main/java/org/apache/cloudstack/utils/redfish/RedfishClient.java +++ b/utils/src/main/java/org/apache/cloudstack/utils/redfish/RedfishClient.java @@ -231,9 +231,8 @@ public class RedfishClient { for (int attempt = 1; attempt < redfishRequestMaxRetries + 1; attempt++) { try { TimeUnit.SECONDS.sleep(WAIT_FOR_REQUEST_RETRY); - LOGGER.debug(String.format("HTTP %s request retry attempt %d/%d [URL: %s].", httpReq.getMethod(), url, attempt, redfishRequestMaxRetries)); + LOGGER.debug(String.format("Retry HTTP %s request [URL: %s], attempt %d/%d.", httpReq.getMethod(), url, attempt, redfishRequestMaxRetries)); response = client.execute(httpReq); - break; } catch (IOException | InterruptedException e) { if (attempt == redfishRequestMaxRetries) { throw new RedfishException(String.format("Failed to execute HTTP %s request retry attempt %d/%d [URL: %s] due to exception %s", httpReq.getMethod(), attempt, redfishRequestMaxRetries,url, e)); diff --git a/utils/src/test/java/org/apache/cloudstack/utils/redfish/RedfishClientTest.java b/utils/src/test/java/org/apache/cloudstack/utils/redfish/RedfishClientTest.java index 674700bd412..15a75bab212 100644 --- a/utils/src/test/java/org/apache/cloudstack/utils/redfish/RedfishClientTest.java +++ b/utils/src/test/java/org/apache/cloudstack/utils/redfish/RedfishClientTest.java @@ -207,26 +207,4 @@ public class RedfishClientTest { Mockito.verify(newRedfishClientspy, Mockito.times(1)).retryHttpRequest(Mockito.anyString(), Mockito.any(), Mockito.any()); Mockito.verify(client, Mockito.times(3)).execute(Mockito.any()); } - - @Test(expected = RedfishException.class) - public void retryHttpRequestExceptionAfterTwoRetries() throws IOException { - Mockito.when(client.execute(httpReq)).thenThrow(IOException.class).thenThrow(IOException.class); - - RedfishClient newRedfishClientspy = Mockito.spy(new RedfishClient(USERNAME, PASSWORD, true, true, REDFISHT_REQUEST_RETRIES)); - newRedfishClientspy.retryHttpRequest(url, httpReq, client); - - Mockito.verify(newRedfishClientspy, Mockito.never()).retryHttpRequest(Mockito.anyString(), Mockito.any(), Mockito.any()); - Mockito.verify(client, Mockito.never()).execute(Mockito.any()); - } - - @Test - public void retryHttpRequestSuccessAtTheSecondRetry() throws IOException { - Mockito.when(client.execute(httpReq)).thenThrow(IOException.class).thenReturn(httpResponse); - - RedfishClient newRedfishClientspy = Mockito.spy(new RedfishClient(USERNAME, PASSWORD, true, true, REDFISHT_REQUEST_RETRIES)); - newRedfishClientspy.retryHttpRequest(url, httpReq, client); - - Mockito.verify(newRedfishClientspy, Mockito.times(1)).retryHttpRequest(Mockito.anyString(), Mockito.any(), Mockito.any()); - Mockito.verify(client, Mockito.times(REDFISHT_REQUEST_RETRIES)).execute(Mockito.any()); - } }