Light, fluffy, and always free - The AWS Local Emulator alternative
fix(opensearch): keep readiness polling after errors (#3373)
Niels Kootstra713a166a7c4f
diff --git a/src/main/java/io/github/hectorvent/floci/services/opensearch/OpenSearchService.java b/src/main/java/io/github/hectorvent/floci/services/opensearch/OpenSearchService.javaindex a5f6b77cd7..32b74998f1 100644--- a/src/main/java/io/github/hectorvent/floci/services/opensearch/OpenSearchService.java+++ b/src/main/java/io/github/hectorvent/floci/services/opensearch/OpenSearchService.java@@ -347,7 +347,11 @@ public class OpenSearchService implements ResourceProvider {}private void startReadinessPoller() {- poller.scheduleWithFixedDelay(() -> {+ poller.scheduleWithFixedDelay(this::pollReadiness, 3, 3, TimeUnit.SECONDS);+ }++ void pollReadiness() {+ try {for (Domain domain : allDomains()) {if (domain.isProcessing() && domainManager.isReady(domain)) {domain.setProcessing(false);@@ -356,7 +360,9 @@ public class OpenSearchService implements ResourceProvider {domain.getDomainName(), domain.getEndpoint());}}- }, 3, 3, TimeUnit.SECONDS);+ } catch (RuntimeException e) {+ LOG.warn("OpenSearch readiness poll failed; will retry", e);+ }}private List<Domain> allDomains() {diff --git a/src/test/java/io/github/hectorvent/floci/services/opensearch/OpenSearchServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/opensearch/OpenSearchServiceTest.javaindex 6da3c7d243..3e36b866f1 100644--- a/src/test/java/io/github/hectorvent/floci/services/opensearch/OpenSearchServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/opensearch/OpenSearchServiceTest.java@@ -12,6 +12,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertFalse;import static org.junit.jupiter.api.Assertions.assertTrue;import static org.mockito.ArgumentMatchers.any;+import static org.mockito.Mockito.atLeast;import static org.mockito.Mockito.mock;import static org.mockito.Mockito.verify;import static org.mockito.Mockito.when;@@ -79,4 +80,22 @@ class OpenSearchServiceTest {assertFalse(domain.isProcessing());verify(domainManager, Mockito.never()).tryStartDomain(any());}++ @Test+ void readinessPollerContinuesAfterOneReadinessFailure() {+ when(domainManager.tryStartDomain(any())).thenReturn(true);+ when(domainManager.isReady(any()))+ .thenThrow(new RuntimeException("temporary readiness failure"))+ .thenReturn(true);++ service.createDomain("ready-recovery", "OpenSearch_2.11",+ null, null, null, "us-east-1");++ service.pollReadiness();+ assertTrue(service.describeDomain("ready-recovery").isProcessing());++ service.pollReadiness();+ assertFalse(service.describeDomain("ready-recovery").isProcessing());+ verify(domainManager, atLeast(2)).isReady(any());+ }}