Skip to content

fix: Fix BufferingPullSubscriber to not seek after sending flow control tokens. #253

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
dpcollins-google merged 1 commit into from
Sep 24, 2020
Merged

fix: Fix BufferingPullSubscriber to not seek after sending flow control tokens. #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 16 additions & 19 deletions ...ubsublite/src/main/java/com/google/cloud/pubsublite/internal/BufferingPullSubscriber.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,13 @@

import com.google.api.core.ApiService.Listener;
import com.google.api.core.ApiService.State;
import com.google.cloud.pubsublite.Offset;
import com.google.cloud.pubsublite.SequencedMessage;
import com.google.cloud.pubsublite.cloudpubsub.FlowControlSettings;
import com.google.cloud.pubsublite.internal.wire.Subscriber;
import com.google.cloud.pubsublite.internal.wire.SubscriberFactory;
import com.google.cloud.pubsublite.proto.Cursor;
import com.google.cloud.pubsublite.proto.FlowControlRequest;
import com.google.cloud.pubsublite.proto.SeekRequest;
import com.google.cloud.pubsublite.proto.SeekRequest.NamedTarget;
import com.google.common.collect.ImmutableList;
import com.google.common.util.concurrent.MoreExecutors;
import io.grpc.StatusException;
Expand All @@ -42,6 +41,15 @@ public class BufferingPullSubscriber implements PullSubscriber<SequencedMessage>

public BufferingPullSubscriber(SubscriberFactory factory, FlowControlSettings settings)
throws StatusException {
this(
factory,
settings,
SeekRequest.newBuilder().setNamedTarget(NamedTarget.COMMITTED_CURSOR).build());
}

public BufferingPullSubscriber(
SubscriberFactory factory, FlowControlSettings settings, SeekRequest initialSeek)
throws StatusException {
underlying = factory.New(messages::addAll);
underlying.addListener(
new Listener() {
Expand All @@ -52,29 +60,18 @@ public void failed(State state, Throwable throwable) {
},
MoreExecutors.directExecutor());
underlying.startAsync().awaitRunning();
underlying.allowFlow(
FlowControlRequest.newBuilder()
.setAllowedMessages(settings.messagesOutstanding())
.setAllowedBytes(settings.bytesOutstanding())
.build());
}

public BufferingPullSubscriber(
SubscriberFactory factory, FlowControlSettings settings, Offset initialLocation)
throws StatusException {
this(factory, settings);
try {
underlying
.seek(
SeekRequest.newBuilder()
.setCursor(Cursor.newBuilder().setOffset(initialLocation.value()))
.build())
.get();
underlying.seek(initialSeek).get();
} catch (InterruptedException e) {
throw ExtractStatus.toCanonical(e);
} catch (ExecutionException e) {
throw ExtractStatus.toCanonical(e.getCause());
}
underlying.allowFlow(
FlowControlRequest.newBuilder()
.setAllowedMessages(settings.messagesOutstanding())
.setAllowedBytes(settings.bytesOutstanding())
.build());
}

@Override
Expand Down
8 changes: 6 additions & 2 deletions ...blite/src/test/java/com/google/cloud/pubsublite/internal/BufferingPullSubscriberTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ public class BufferingPullSubscriberTest {
private final SubscriberFactory underlyingFactory = mock(SubscriberFactory.class);
private final Subscriber underlying = mock(Subscriber.class);
private final Offset initialOffset = Offset.of(5);
private final SeekRequest initialSeek =
SeekRequest.newBuilder()
.setCursor(Cursor.newBuilder().setOffset(initialOffset.value()))
.build();
private final FlowControlSettings flowControlSettings =
((Supplier<FlowControlSettings>)
() -> {
Expand Down Expand Up @@ -102,15 +106,15 @@ public void setUp() throws Exception {
.when(underlying)
.addListener(any(), any());

subscriber = new BufferingPullSubscriber(underlyingFactory, flowControlSettings, initialOffset);
subscriber = new BufferingPullSubscriber(underlyingFactory, flowControlSettings, initialSeek);

InOrder inOrder = inOrder(underlyingFactory, underlying);
inOrder.verify(underlyingFactory).New(any());
inOrder.verify(underlying).addListener(any(), any());
inOrder.verify(underlying).startAsync();
inOrder.verify(underlying).awaitRunning();
inOrder.verify(underlying).allowFlow(flow);
inOrder.verify(underlying).seek(seek);
inOrder.verify(underlying).allowFlow(flow);

assertThat(messageConsumer).isNotNull();
assertThat(errorListener).isNotNull();
Expand Down
6 changes: 5 additions & 1 deletion ...ite-beam-io/src/main/java/com/google/cloud/pubsublite/beam/PubsubLiteUnboundedSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
import com.google.cloud.pubsublite.internal.BufferingPullSubscriber;
import com.google.cloud.pubsublite.internal.wire.Committer;
import com.google.cloud.pubsublite.internal.wire.SubscriberFactory;
import com.google.cloud.pubsublite.proto.Cursor;
import com.google.cloud.pubsublite.proto.SeekRequest;
import com.google.common.base.Ticker;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
Expand Down Expand Up @@ -87,7 +89,9 @@ public UnboundedReader<SequencedMessage> createReader(
new BufferingPullSubscriber(
subscriberFactories.get(partition),
subscriberOptions.flowControlSettings(),
checkpointed);
SeekRequest.newBuilder()
.setCursor(Cursor.newBuilder().setOffset(checkpointed.value()))
.build());
} else {
state.subscriber =
new BufferingPullSubscriber(
Expand Down