Light, fluffy, and always free - The AWS Local Emulator alternative
fix(sqs): delayed FIFO message no longer blocks its message group (#2112)
leepokaifa8f8d78a4aa
diff --git a/src/main/java/io/github/hectorvent/floci/services/sqs/GuardedMessageQueue.java b/src/main/java/io/github/hectorvent/floci/services/sqs/GuardedMessageQueue.javaindex b10f88b769..6495e399bc 100644--- a/src/main/java/io/github/hectorvent/floci/services/sqs/GuardedMessageQueue.java+++ b/src/main/java/io/github/hectorvent/floci/services/sqs/GuardedMessageQueue.java@@ -120,9 +120,13 @@ class GuardedMessageQueue {// message from a previous ReceiveMessage call is blocked until that// message is deleted or its visibility expires. Within a single call// we may return multiple messages from the same group (preserving- // insertion order), up to MaxNumberOfMessages.+ // insertion order), up to MaxNumberOfMessages. A not-visible message+ // that was never claimed — no receipt handle — is only waiting out its+ // DelaySeconds and must not lock its group.Set<String> groupsWithInFlight =- messages.stream().filter(msg -> !msg.isVisible() && msg.getMessageGroupId() != null)+ messages.stream()+ .filter(msg -> !msg.isVisible() && msg.getReceiptHandle() != null+ && msg.getMessageGroupId() != null).map(Message::getMessageGroupId).collect(Collectors.toSet());for (Message msg : messages) {diff --git a/src/test/java/io/github/hectorvent/floci/services/sqs/GuardedMessageQueueTest.java b/src/test/java/io/github/hectorvent/floci/services/sqs/GuardedMessageQueueTest.javaindex f219443677..e386865d64 100644--- a/src/test/java/io/github/hectorvent/floci/services/sqs/GuardedMessageQueueTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/sqs/GuardedMessageQueueTest.java@@ -218,6 +218,27 @@ class GuardedMessageQueueTest {assertTrue(second.claimed().isEmpty());}+ @Test+ void fifoDelayedMessageDoesNotLockItsMessageGroup() {+ // Only in-flight messages (claimed, within their visibility timeout)+ // lock a FIFO message group. A message still waiting out its+ // DelaySeconds was never claimed — no receipt handle — and must not+ // make an already-visible message in the same group unreceivable.+ Message visible = new Message("visible");+ visible.setMessageGroupId("group1");+ Message delayed = new Message("delayed");+ delayed.setMessageGroupId("group1");+ delayed.setVisibleAt(Instant.now().plusSeconds(60));++ queue.addMessage(visible);+ queue.addMessage(delayed);++ var result = queue.claimVisibleMessages(10, 30, true, -1, null);+ assertEquals(1, result.claimed().size(),+ "A delayed message must not block its message group");+ assertEquals("visible", result.claimed().get(0).getBody());+ }+// --- DLQ ---@Testdiff --git a/src/test/java/io/github/hectorvent/floci/services/sqs/SqsFifoIntegrationTest.java b/src/test/java/io/github/hectorvent/floci/services/sqs/SqsFifoIntegrationTest.javaindex 1723836342..9c631dd3a7 100644--- a/src/test/java/io/github/hectorvent/floci/services/sqs/SqsFifoIntegrationTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/sqs/SqsFifoIntegrationTest.java@@ -153,6 +153,71 @@ class SqsFifoIntegrationTest {@Test@Order(8)+ void delayedMessageDoesNotBlockVisibleMessageInSameGroup() throws InterruptedException {+ // Issue #2104: a message still waiting out DelaySeconds must not lock+ // its message group — only in-flight messages do.+ String delayQueueUrl = given()+ .contentType("application/x-www-form-urlencoded")+ .formParam("Action", "CreateQueue")+ .formParam("QueueName", "fifo-delay-lock.fifo")+ .formParam("Attribute.1.Name", "FifoQueue")+ .formParam("Attribute.1.Value", "true")+ .formParam("Attribute.2.Name", "DelaySeconds")+ .formParam("Attribute.2.Value", "1")+ .when()+ .post("/")+ .then()+ .statusCode(200)+ .extract().xmlPath().getString("CreateQueueResponse.CreateQueueResult.QueueUrl");++ given()+ .contentType("application/x-www-form-urlencoded")+ .formParam("Action", "SendMessage")+ .formParam("QueueUrl", delayQueueUrl)+ .formParam("MessageBody", "A")+ .formParam("MessageGroupId", "group-a")+ .formParam("MessageDeduplicationId", "a1")+ .when()+ .post("/")+ .then()+ .statusCode(200);++ Thread.sleep(1100);++ given()+ .contentType("application/x-www-form-urlencoded")+ .formParam("Action", "SendMessage")+ .formParam("QueueUrl", delayQueueUrl)+ .formParam("MessageBody", "B")+ .formParam("MessageGroupId", "group-a")+ .formParam("MessageDeduplicationId", "b1")+ .when()+ .post("/")+ .then()+ .statusCode(200);++ given()+ .contentType("application/x-www-form-urlencoded")+ .formParam("Action", "ReceiveMessage")+ .formParam("QueueUrl", delayQueueUrl)+ .when()+ .post("/")+ .then()+ .statusCode(200)+ .body(containsString("<Body>A</Body>"));++ given()+ .contentType("application/x-www-form-urlencoded")+ .formParam("Action", "DeleteQueue")+ .formParam("QueueUrl", delayQueueUrl)+ .when()+ .post("/")+ .then()+ .statusCode(200);+ }++ @Test+ @Order(9)void deleteFifoQueue() {given().contentType("application/x-www-form-urlencoded")diff --git a/src/test/java/io/github/hectorvent/floci/services/sqs/SqsServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/sqs/SqsServiceTest.javaindex 18e06eab17..598e85b2ce 100644--- a/src/test/java/io/github/hectorvent/floci/services/sqs/SqsServiceTest.java+++ b/src/test/java/io/github/hectorvent/floci/services/sqs/SqsServiceTest.java@@ -445,6 +445,26 @@ class SqsServiceTest {"Message should become visible once DelaySeconds elapses");}+ @Test+ void fifoDelayedMessageDoesNotBlockVisibleMessageInSameGroup() {+ // Issue #2104: only in-flight messages lock a FIFO message group. A+ // newly sent, still-delayed message must not make an already-visible+ // message in the same group unreceivable.+ String region = "eu-west-1";+ Queue queue = sqsService.createQueue("delay-group-lock.fifo",+ Map.of("ContentBasedDeduplication", "true", "DelaySeconds", "1"), region);+ sqsService.sendMessage(queue.getQueueUrl(), "A", 0, "group1", null, region);++ try { Thread.sleep(1100); } catch (InterruptedException e) { Thread.currentThread().interrupt(); }++ sqsService.sendMessage(queue.getQueueUrl(), "B", 0, "group1", null, region);++ List<Message> received = sqsService.receiveMessage(queue.getQueueUrl(), 10, 0, 0, region);+ assertEquals(1, received.size(),+ "The already-visible message must be returned despite a delayed message in its group");+ assertEquals("A", received.get(0).getBody());+ }+@Testvoid fifoQueueIgnoresPerMessageDelaySeconds() {// AWS SQS FIFO queues only support queue-level DelaySeconds; any