Skip to content
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.

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

fix(sqs): wait for receive message completion(#569) #571

Merged
merged 1 commit into from
Dec 19, 2024
Merged
Changes from all commits
Commits
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
36 changes: 18 additions & 18 deletions src/main/java/io/kestra/plugin/aws/sqs/RealtimeTrigger.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,16 @@
import lombok.experimental.SuperBuilder;
import org.reactivestreams.Publisher;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import software.amazon.awssdk.services.sqs.SqsAsyncClient;
import software.amazon.awssdk.services.sqs.model.DeleteMessageRequest;
import software.amazon.awssdk.services.sqs.model.ReceiveMessageRequest;
import software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse;

import java.time.Duration;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.atomic.AtomicBoolean;

@SuperBuilder
Expand Down Expand Up @@ -148,30 +152,26 @@ public Flux<Message> publisher(final Consume task,
.maxNumberOfMessages(runContext.render(maxNumberOfMessage).as(Integer.class).orElseThrow())
.build();

sqsClient.receiveMessage(receiveRequest)
.whenComplete((messageResponse, throwable) -> {
if (throwable != null) {
fluxSink.error(throwable);
} else {
messageResponse.messages().forEach(message -> {
fluxSink.next(Message.builder().data(message.body()).build());
});
messageResponse.messages().forEach(message ->
sqsClient.deleteMessage(DeleteMessageRequest.builder()
.queueUrl(renderedQueueUrl)
.receiptHandle(message.receiptHandle())
.build()
)
);
}
});
final CompletableFuture<ReceiveMessageResponse> future = sqsClient.receiveMessage(receiveRequest);

try {
Thread.sleep(100);
ReceiveMessageResponse response = future.get();
response.messages().forEach(message -> fluxSink.next(Message.builder().data(message.body()).build()));

response.messages().forEach(message ->
sqsClient.deleteMessage(DeleteMessageRequest.builder()
.queueUrl(renderedQueueUrl)
.receiptHandle(message.receiptHandle())
.build()
)
);
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
isActive.set(false); // proactively stop polling
}
}
} catch (ExecutionException e) {
fluxSink.error(e.getCause() != null ? e.getCause() : e);
} catch (Throwable e) {
fluxSink.error(e);
} finally {
Expand Down
Loading