Skip to content

Fixing sqs fifo message order consuming #192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 8, 2022
Merged

Fixing sqs fifo message order consuming #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
844420a
Fixing sqs fifo message order consuming
fernandomoraes Oct 8, 2021
7b26809
Fixing sqs fifo message order consuming
fernandomoraes Oct 8, 2021
3f20e9f
Merge remote-tracking branch 'origin/2.3.x' into fernandomoraes/2.3.x
maciejwalkowiak Feb 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions ...ng/src/main/java/io/awspring/cloud/messaging/listener/SimpleMessageListenerContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,9 @@ public void run() {
catch (MessagingException messagingException) {
getLogger().warn("An exception occurred while handling message with id: {}", message.getMessageId(),
messagingException);
applyDeletionPolicyOnError(receiptHandle);
if (!applyDeletionPolicyOnError(receiptHandle)) {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was wondering about this also. Perhaps it would be a little clearer like this ? (Just a proposition)

Suggested change
if (!applyDeletionPolicyOnError(receiptHandle)) {
if (shouldDeleteMessageOnError(receiptHandle)) {
deleteMessage(receiptHandle);
} else {
break;
}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeh, I agree with you, it would be clearer

break;
}
}
}
}
Expand All @@ -442,11 +444,13 @@ private void applyDeletionPolicyOnSuccess(String receiptHandle) {
}
}

private void applyDeletionPolicyOnError(String receiptHandle) {
private boolean applyDeletionPolicyOnError(String receiptHandle) {
if (this.deletionPolicy == SqsMessageDeletionPolicy.ALWAYS
|| (this.deletionPolicy == SqsMessageDeletionPolicy.NO_REDRIVE && !this.hasRedrivePolicy)) {
deleteMessage(receiptHandle);
return true;
}
return false;
}

private void deleteMessage(String receiptHandle) {
Expand Down
71 changes: 71 additions & 0 deletions ...rc/test/java/io/awspring/cloud/messaging/listener/SimpleMessageListenerContainerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,77 @@ public void handleMessage(org.springframework.messaging.Message<?> message) thro
container.stop();
}

@Test
void testReceiveMessagesFromFifoQueueWithError() throws Exception {
SimpleMessageListenerContainer container = new SimpleMessageListenerContainer();

AmazonSQSAsync sqs = mock(AmazonSQSAsync.class, withSettings().stubOnly());
container.setAmazonSqs(sqs);

CountDownLatch countDownLatch = new CountDownLatch(3);
List<String> actualHandledMessages = Collections.synchronizedList(new ArrayList<>());
QueueMessageHandler messageHandler = new QueueMessageHandler(Collections.emptyList(),
SqsMessageDeletionPolicy.ON_SUCCESS) {

@Override
public void handleMessage(org.springframework.messaging.Message<?> message) throws MessagingException {
actualHandledMessages.add((String) message.getPayload());
countDownLatch.countDown();
throw new MessagingException(message);
}

};
container.setMessageHandler(messageHandler);
StaticApplicationContext applicationContext = new StaticApplicationContext();
applicationContext.registerSingleton("fifoTestMessageListener", FifoTestMessageListener.class);
messageHandler.setApplicationContext(applicationContext);
container.setBeanName("testContainerName");
messageHandler.afterPropertiesSet();

mockGetQueueUrl(sqs, "testQueue.fifo", "http://testSimpleReceiveMessage.amazonaws.com");
mockGetQueueAttributesWithEmptyResult(sqs, "http://testSimpleReceiveMessage.amazonaws.com");

container.afterPropertiesSet();

final Message group1Msg1 = fifoMessage("1", "group1Msg1");
final Message group1Msg2 = fifoMessage("1", "group1Msg2");
final Message group1Msg3 = fifoMessage("1", "group1Msg3");
final Message group1Msg4 = fifoMessage("1", "group1Msg4");
final Message group1Msg5 = fifoMessage("1", "group1Msg5");
final Message group1Msg6 = fifoMessage("1", "group1Msg6");
final Message group1Msg7 = fifoMessage("1", "group1Msg7");
final Message group2Msg1 = fifoMessage("2", "group2Msg1");
final Message group2Msg2 = fifoMessage("2", "group2Msg2");
final Message group3Msg1 = fifoMessage("3", "group3Msg1");

when(sqs.receiveMessage(
new ReceiveMessageRequest("http://testSimpleReceiveMessage.amazonaws.com").withAttributeNames("All")
.withMessageAttributeNames("All").withMaxNumberOfMessages(10).withWaitTimeSeconds(20)))
.thenReturn(new ReceiveMessageResult().withMessages(group1Msg1, group1Msg2, group1Msg3,
group1Msg4, group1Msg5, group1Msg6, group1Msg7, group2Msg1, group2Msg2,
group3Msg1))
.thenReturn(new ReceiveMessageResult());

when(sqs.getQueueAttributes(any(GetQueueAttributesRequest.class))).thenReturn(new GetQueueAttributesResult());

container.start();

assertThat(countDownLatch.await(3, TimeUnit.SECONDS)).isTrue();

final List<String> actualGroup1Messages = actualHandledMessages.stream().filter(msg -> msg.startsWith("group1"))
.collect(Collectors.toList());
final List<String> actualGroup2Messages = actualHandledMessages.stream().filter(msg -> msg.startsWith("group2"))
.collect(Collectors.toList());
final List<String> actualGroup3Messages = actualHandledMessages.stream().filter(msg -> msg.startsWith("group3"))
.collect(Collectors.toList());

assertThat(actualGroup1Messages).containsExactly("group1Msg1");
assertThat(actualGroup2Messages).containsExactly("group2Msg1");
assertThat(actualGroup3Messages).containsExactly("group3Msg1");

container.stop();
}

@Test
void testContainerDoesNotProcessMessageAfterBeingStopped() throws Exception {
SimpleMessageListenerContainer container = new SimpleMessageListenerContainer();
Expand Down