Light, fluffy, and always free - The AWS Local Emulator alternative
fix(redshift-data): isolate receipt sweep failures (#6376)
Andre Kurait5db958c2018c
diff --git a/src/main/java/io/github/hectorvent/floci/services/redshiftdata/RedshiftDataStatementStore.java b/src/main/java/io/github/hectorvent/floci/services/redshiftdata/RedshiftDataStatementStore.javaindex 4c0102b0e2..c420032f81 100644--- a/src/main/java/io/github/hectorvent/floci/services/redshiftdata/RedshiftDataStatementStore.java+++ b/src/main/java/io/github/hectorvent/floci/services/redshiftdata/RedshiftDataStatementStore.java@@ -132,7 +132,11 @@ class RedshiftDataStatementStore {void sweep() {if (idempotency != null) {- idempotency.sweep();+ try {+ idempotency.sweep();+ } catch (RuntimeException failure) {+ LOG.warnv(failure, "Failed to sweep expired Redshift Data API client-token receipts");+ }}Instant cutoff = Instant.now(clock).minus(ttl);// The sweep thread has no request context, so it iterates every account's partitiondiff --git a/src/test/java/io/github/hectorvent/floci/services/redshiftdata/RedshiftDataStatementStoreTest.java b/src/test/java/io/github/hectorvent/floci/services/redshiftdata/RedshiftDataStatementStoreTest.javaindex 436f7b3661..92de293081 100644--- a/src/test/java/io/github/hectorvent/floci/services/redshiftdata/RedshiftDataStatementStoreTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/redshiftdata/RedshiftDataStatementStoreTest.java@@ -5,8 +5,15 @@ import com.fasterxml.jackson.databind.ObjectMapper;import com.fasterxml.jackson.databind.SerializationFeature;import com.fasterxml.jackson.databind.node.ArrayNode;import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;+import io.github.hectorvent.floci.config.EmulatorConfig;+import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;+import io.github.hectorvent.floci.core.storage.StorageFactory;import org.junit.jupiter.api.Test;+import org.junit.jupiter.params.ParameterizedTest;+import org.junit.jupiter.params.provider.ValueSource;+import java.io.IOException;+import java.io.UncheckedIOException;import java.time.Clock;import java.time.Duration;import java.time.Instant;@@ -18,9 +25,41 @@ import static org.junit.jupiter.api.Assertions.assertEquals;import static org.junit.jupiter.api.Assertions.assertNotNull;import static org.junit.jupiter.api.Assertions.assertNull;import static org.junit.jupiter.api.Assertions.assertTrue;+import static org.mockito.Mockito.*;class RedshiftDataStatementStoreTest {+ @ParameterizedTest+ @ValueSource(booleans = {false, true})+ void receiptSweepFailureDoesNotPreventOwnedStatementEviction(boolean receiptFailure) {+ StorageFactory factory = mock(StorageFactory.class);+ AccountAwareStorageBackend<RedshiftDataStatementStore.StoredStatement> backend =+ AccountAwareStorageBackend.inMemory("000000000000");+ when(factory.<RedshiftDataStatementStore.StoredStatement>create(eq("redshift-data"),+ eq("statements.json"), any())).thenReturn(backend);+ EmulatorConfig config = mock(EmulatorConfig.class, RETURNS_DEEP_STUBS);+ when(config.services().redshiftData().resultTtlHours()).thenReturn(24);+ RedshiftDataIdempotencyStore receipts = mock(RedshiftDataIdempotencyStore.class);+ if (receiptFailure) {+ doThrow(new UncheckedIOException(new IOException("receipt replacement failed")))+ .when(receipts).sweep();+ }+ RedshiftDataStatementStore store = new RedshiftDataStatementStore(factory, config, receipts);+ Instant now = Instant.now();+ store.putForAccount("111111111111", statement("same-id", now.minus(Duration.ofHours(48))));+ store.putForAccount("222222222222", statement("same-id", now.minus(Duration.ofHours(1))));+ RedshiftDataStatementStore.StoredStatement active = statement("active", now.minus(Duration.ofHours(48)));+ active.status = RedshiftDataStatementStore.Status.STARTED;+ store.putForAccount("111111111111", active);++ store.sweep();++ verify(receipts).sweep();+ assertNull(store.getForAccount("111111111111", "same-id"));+ assertNotNull(store.getForAccount("222222222222", "same-id"));+ assertNotNull(store.getForAccount("111111111111", "active"));+ }+@Testvoid recoveryFailsInterruptedWorkWithoutChangingTerminalResults() {RedshiftDataStatementStore store = new RedshiftDataStatementStore(24, Clock.systemUTC());