-
Notifications
You must be signed in to change notification settings - Fork 146
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Pull ack batching out of the source task
- Loading branch information
1 parent
1859512
commit c2eb727
Showing
3 changed files
with
132 additions
and
80 deletions.
There are no files selected for viewing
79 changes: 79 additions & 0 deletions
79
kafka-connector/src/main/java/com/google/pubsub/kafka/source/AckBatchingSubscriber.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| package com.google.pubsub.kafka.source; | ||
|
|
||
| import com.google.api.core.ApiFuture; | ||
| import com.google.api.core.ApiFutureCallback; | ||
| import com.google.api.core.ApiFutures; | ||
| import com.google.api.core.SettableApiFuture; | ||
| import com.google.common.util.concurrent.MoreExecutors; | ||
| import com.google.errorprone.annotations.concurrent.GuardedBy; | ||
| import com.google.protobuf.Empty; | ||
| import com.google.pubsub.v1.ReceivedMessage; | ||
| import java.util.ArrayDeque; | ||
| import java.util.ArrayList; | ||
| import java.util.Collection; | ||
| import java.util.Deque; | ||
| import java.util.List; | ||
| import java.util.concurrent.ScheduledExecutorService; | ||
| import java.util.concurrent.ScheduledFuture; | ||
| import java.util.concurrent.TimeUnit; | ||
| import org.apache.commons.lang3.tuple.Pair; | ||
|
|
||
| public class AckBatchingSubscriber implements CloudPubSubSubscriber { | ||
|
|
||
| private final CloudPubSubSubscriber underlying; | ||
| @GuardedBy("this") | ||
| private final Deque<Pair<Collection<String>, SettableApiFuture<Empty>>> toSend = new ArrayDeque<>(); | ||
| private final ScheduledFuture<?> alarm; | ||
|
|
||
| public AckBatchingSubscriber(CloudPubSubSubscriber underlying, | ||
| ScheduledExecutorService executor) { | ||
| this.underlying = underlying; | ||
| this.alarm = executor.scheduleAtFixedRate(this::flush, 100, 100, TimeUnit.MILLISECONDS); | ||
| } | ||
|
|
||
| @Override | ||
| public ApiFuture<List<ReceivedMessage>> pull() { | ||
| return underlying.pull(); | ||
| } | ||
|
|
||
| @Override | ||
| public synchronized ApiFuture<Empty> ackMessages(Collection<String> ackIds) { | ||
| SettableApiFuture<Empty> result = SettableApiFuture.create(); | ||
| toSend.add(Pair.of(ackIds, result)); | ||
| return result; | ||
| } | ||
|
|
||
| private void flush() { | ||
| List<String> ackIds = new ArrayList<>(); | ||
| List<SettableApiFuture<Empty>> futures = new ArrayList<>(); | ||
| synchronized (this) { | ||
| if (toSend.isEmpty()) { | ||
| return; | ||
| } | ||
| toSend.forEach(pair -> { | ||
| ackIds.addAll(pair.getLeft()); | ||
| futures.add(pair.getRight()); | ||
| }); | ||
| toSend.clear(); | ||
| } | ||
| ApiFuture<Empty> response = underlying.ackMessages(ackIds); | ||
| ApiFutures.addCallback(response, new ApiFutureCallback<Empty>() { | ||
| @Override | ||
| public void onFailure(Throwable t) { | ||
| futures.forEach(future -> future.setException(t)); | ||
| } | ||
|
|
||
| @Override | ||
| public void onSuccess(Empty result) { | ||
| futures.forEach(future -> future.set(result)); | ||
| } | ||
| }, MoreExecutors.directExecutor()); | ||
| } | ||
|
|
||
| @Override | ||
| public void close() { | ||
| alarm.cancel(false); | ||
| flush(); | ||
| underlying.close(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 5 additions & 0 deletions
5
kafka-connector/src/test/java/com/google/pubsub/kafka/source/AckBatchingSubscriberTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| package com.google.pubsub.kafka.source; | ||
|
|
||
| public class AckBatchingSubscriberTest { | ||
|
|
||
| } |