luciano/amazon-kinesis-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove the shutdown event from the queue before executing the shudown event

Browse source
This commit is contained in:
Chunxue Yang 2019-11-01 09:47:24 -07:00
parent c7754c4eda
commit c5c4e428f2
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
amazon-kinesis-client/src/main/java/software/amazon/kinesis/retrieval/fanout/FanOutRecordsPublisher.java
View file

@ -168,7 +168,7 @@ public class FanOutRecordsPublisher implements RecordsPublisher {
flowToBeReturned = recordsRetrievedContext.getRecordFlow(); flowToBeReturned = recordsRetrievedContext.getRecordFlow();
// Try scheduling the next event in the queue or execute the subscription shutdown action. // Try scheduling the next event in the queue or execute the subscription shutdown action.
if (!recordsDeliveryQueue.isEmpty()) { if (!recordsDeliveryQueue.isEmpty()) {
recordsDeliveryQueue.peek().executeEventAction(subscriber); recordsDeliveryQueue.peek().executeEventAction(subscriber, recordsDeliveryQueue);
} }
} else { } else {
// Check if the mismatched event belongs to active flow. If publisher receives an ack for a // Check if the mismatched event belongs to active flow. If publisher receives an ack for a
@ -225,9 +225,15 @@ public class FanOutRecordsPublisher implements RecordsPublisher {
} }
// This method is not thread-safe. You need to acquire a lock in the caller in order to execute this. // This method is not thread-safe. You need to acquire a lock in the caller in order to execute this.
void executeEventAction(Subscriber<? super RecordsRetrieved> subscriber) { void executeEventAction(Subscriber<? super RecordsRetrieved> subscriber, BlockingQueue<RecordsRetrievedContext> recordsDeliveryQueue) {
recordsOrShutdownEvent.apply(recordsEvent -> subscriber.onNext(recordsEvent), recordsOrShutdownEvent.apply(recordsEvent -> subscriber.onNext(recordsEvent),
shutdownEvent -> shutdownEvent.getSubscriptionShutdownAction().run()); shutdownEvent -> handleShutdownEvent(shutdownEvent, recordsDeliveryQueue));
}
private void handleShutdownEvent(SubscriptionShutdownEvent shutdownEvent, BlockingQueue<RecordsRetrievedContext> recordsDeliveryQueue) {
//Removing the Shutdown Event from the queue before executing the Shutdown action.
recordsDeliveryQueue.poll();
shutdownEvent.getSubscriptionShutdownAction().run();
} }
} }