iht commented on code in PR #38603:
URL: https://github.com/apache/beam/pull/38603#discussion_r3311152645
##########
sdks/java/io/solace/src/main/java/org/apache/beam/sdk/io/solace/read/UnboundedSolaceReader.java:
##########
@@ -158,23 +163,30 @@ public boolean advance() {
@Override
public void close() {
- finalizeReadyMessages();
sessionServiceCache.invalidate(readerUuid);
+ ActiveReadersRegistry.unregister(readerUuid);
}
- public void finalizeReadyMessages() {
- BytesXMLMessage msg;
- while ((msg = safeToAckMessages.poll()) != null) {
+ void finalizeCheckpoint(long checkpointId) {
+ List<BytesXMLMessage> messagesToAck = new ArrayList<>();
+
+ synchronized (lock) {
+ SortedMap<Long, List<BytesXMLMessage>> toAck =
pendingCheckpoints.headMap(checkpointId, true);
+ for (List<BytesXMLMessage> msgs : toAck.values()) {
+ messagesToAck.addAll(msgs);
+ }
+ toAck.clear();
+ }
+
+ for (BytesXMLMessage msg : messagesToAck) {
try {
msg.ackMessage();
Review Comment:
Nice addition, I will submit a commit with this change.
##########
sdks/java/io/solace/src/main/java/org/apache/beam/sdk/io/solace/read/UnboundedSolaceReader.java:
##########
@@ -190,9 +202,13 @@ public Instant getWatermark() {
@Override
public UnboundedSource.CheckpointMark getCheckpointMark() {
- safeToAckMessages.addAll(receivedMessages);
+ long checkpointId = nextCheckpointId++;
+ ImmutableList<BytesXMLMessage> messages =
ImmutableList.copyOf(receivedMessages);
receivedMessages.clear();
- return new SolaceCheckpointMark(safeToAckMessages);
+ synchronized (lock) {
+ pendingCheckpoints.put(checkpointId, messages);
Review Comment:
I can add two counter metrics, for the total messages read and acked.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
