-
Notifications
You must be signed in to change notification settings - Fork 55
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Implement retry for UpdateTimestampService (#524)
- Loading branch information
Showing
12 changed files
with
216 additions
and
46 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
43 changes: 43 additions & 0 deletions
43
src/main/java/edu/hawaii/its/api/service/RetryExecutorService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| package edu.hawaii.its.api.service; | ||
|
|
||
| import org.springframework.stereotype.Service; | ||
|
|
||
| import edu.hawaii.its.api.wrapper.Command; | ||
| import edu.hawaii.its.api.wrapper.Results; | ||
|
|
||
| import edu.internet2.middleware.grouperClientExt.org.apache.commons.logging.Log; | ||
| import edu.internet2.middleware.grouperClientExt.org.apache.commons.logging.LogFactory; | ||
|
|
||
| @Service | ||
| public class RetryExecutorService { | ||
| protected final Log logger = LogFactory.getLog(getClass()); | ||
|
|
||
| private static final int MAX_RETRIES = 2; | ||
| private static final int DELAY = 1000; | ||
|
|
||
| public <T extends Results> T execute(Command<T> command) { | ||
| String text = "execute; " + command.getClass().getSimpleName() + ": "; | ||
| for (int i = 0; i <= MAX_RETRIES; i++) { | ||
| try { | ||
| T result = command.execute(); | ||
| if (result.getResultCode().equals("SUCCESS")) { | ||
| logger.debug(text + "execution success"); | ||
| return result; | ||
| } | ||
| } catch (Exception e) { | ||
| logger.error(text + e); | ||
| } | ||
| logger.debug(text + "Execution failed, retrying in " + DELAY * i + " ms"); | ||
| delay(i); | ||
| } | ||
| return null; | ||
| } | ||
|
|
||
| protected void delay(int i) { | ||
| try { | ||
| Thread.sleep((long) DELAY * i); | ||
| } catch (InterruptedException ie) { | ||
| logger.error(ie); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
115 changes: 115 additions & 0 deletions
115
src/test/java/edu/hawaii/its/api/service/RetryExecutorServiceTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| package edu.hawaii.its.api.service; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
| import static org.junit.jupiter.api.Assertions.assertNotNull; | ||
| import static org.junit.jupiter.api.Assertions.assertTrue; | ||
| import static org.mockito.Mockito.doReturn; | ||
| import static org.mockito.Mockito.doThrow; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
| import org.mockito.Mock; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.boot.test.context.SpringBootTest; | ||
| import org.springframework.test.context.ActiveProfiles; | ||
|
|
||
| import edu.hawaii.its.api.configuration.SpringBootWebApplication; | ||
| import edu.hawaii.its.api.wrapper.Command; | ||
| import edu.hawaii.its.api.wrapper.MockResults; | ||
|
|
||
| @ActiveProfiles("localTest") | ||
| @SpringBootTest(classes = { SpringBootWebApplication.class }) | ||
| public class RetryExecutorServiceTest { | ||
|
|
||
| @Mock | ||
| private Command<MockResults> mockCommand; | ||
|
|
||
| @Autowired | ||
| private RetryExecutorService retryExec; | ||
|
|
||
| @Test | ||
| public void successfulRetry() { | ||
| doReturn(new MockResults("SUCCESS")).when(mockCommand).execute(); | ||
| assertSuccessfulRetry(mockCommand); | ||
|
|
||
| doThrow(RuntimeException.class).when(mockCommand).execute(); | ||
| doReturn(new MockResults("SUCCESS")).when(mockCommand).execute(); | ||
| assertSuccessfulRetry(mockCommand); | ||
|
|
||
| doReturn(new MockResults("FAILURE")).when(mockCommand).execute(); | ||
| doReturn(new MockResults("SUCCESS")).when(mockCommand).execute(); | ||
| assertSuccessfulRetry(mockCommand); | ||
|
|
||
| doThrow(RuntimeException.class).when(mockCommand).execute(); | ||
| doThrow(RuntimeException.class).when(mockCommand).execute(); | ||
| doReturn(new MockResults("SUCCESS")).when(mockCommand).execute(); | ||
| assertSuccessfulRetry(mockCommand); | ||
|
|
||
| doReturn(new MockResults("FAILURE")).when(mockCommand).execute(); | ||
| doReturn(new MockResults("FAILURE")).when(mockCommand).execute(); | ||
| doReturn(new MockResults("SUCCESS")).when(mockCommand).execute(); | ||
| assertSuccessfulRetry(mockCommand); | ||
|
|
||
| doThrow(RuntimeException.class).when(mockCommand).execute(); | ||
| doReturn(new MockResults("FAILURE")).when(mockCommand).execute(); | ||
| doReturn(new MockResults("SUCCESS")).when(mockCommand).execute(); | ||
| assertSuccessfulRetry(mockCommand); | ||
|
|
||
| doReturn(new MockResults("FAILURE")).when(mockCommand).execute(); | ||
| doThrow(RuntimeException.class).when(mockCommand).execute(); | ||
| doReturn(new MockResults("SUCCESS")).when(mockCommand).execute(); | ||
| assertSuccessfulRetry(mockCommand); | ||
| } | ||
|
|
||
| @Test | ||
| public void unsuccessfulRetry() { | ||
| doThrow(RuntimeException.class).when(mockCommand).execute(); | ||
| doThrow(RuntimeException.class).when(mockCommand).execute(); | ||
| doThrow(RuntimeException.class).when(mockCommand).execute(); | ||
| assertUnsuccessfulRetry(mockCommand); | ||
|
|
||
| doReturn(new MockResults("FAILURE")).when(mockCommand).execute(); | ||
| doThrow(RuntimeException.class).when(mockCommand).execute(); | ||
| doThrow(RuntimeException.class).when(mockCommand).execute(); | ||
| assertUnsuccessfulRetry(mockCommand); | ||
|
|
||
| doThrow(RuntimeException.class).when(mockCommand).execute(); | ||
| doReturn(new MockResults("FAILURE")).when(mockCommand).execute(); | ||
| doThrow(RuntimeException.class).when(mockCommand).execute(); | ||
| assertUnsuccessfulRetry(mockCommand); | ||
|
|
||
| doThrow(RuntimeException.class).when(mockCommand).execute(); | ||
| doThrow(RuntimeException.class).when(mockCommand).execute(); | ||
| doReturn(new MockResults("FAILURE")).when(mockCommand).execute(); | ||
| assertUnsuccessfulRetry(mockCommand); | ||
|
|
||
| doReturn(new MockResults("FAILURE")).when(mockCommand).execute(); | ||
| doReturn(new MockResults("FAILURE")).when(mockCommand).execute(); | ||
| doThrow(RuntimeException.class).when(mockCommand).execute(); | ||
| assertUnsuccessfulRetry(mockCommand); | ||
|
|
||
| doThrow(RuntimeException.class).when(mockCommand).execute(); | ||
| doReturn(new MockResults("FAILURE")).when(mockCommand).execute(); | ||
| doReturn(new MockResults("FAILURE")).when(mockCommand).execute(); | ||
| assertUnsuccessfulRetry(mockCommand); | ||
| } | ||
|
|
||
| @Test | ||
| public void catchInterruptedException() { | ||
| Thread thread = new Thread(() -> retryExec.delay(0)); | ||
| thread.start(); | ||
| thread.interrupt(); | ||
| assertNotNull(thread); | ||
| } | ||
|
|
||
| private void assertSuccessfulRetry(Command<MockResults> command) { | ||
| MockResults result = retryExec.execute(command); | ||
| assertNotNull(result); | ||
| assertEquals(result.getResultCode(), "SUCCESS"); | ||
| } | ||
|
|
||
| private void assertUnsuccessfulRetry(Command<MockResults> command) { | ||
| MockResults result = retryExec.execute(command); | ||
| assertTrue(result == null || !result.getResultCode().equals("SUCCESS")); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| package edu.hawaii.its.api.wrapper; | ||
|
|
||
| public class MockResults extends Results { | ||
| private String resultCode; | ||
|
|
||
| public MockResults(String resultCode) { | ||
| this.resultCode = resultCode; | ||
| } | ||
|
|
||
| @Override | ||
| public String getResultCode() { | ||
| return resultCode; | ||
| } | ||
| } |
Oops, something went wrong.