Skip to content

fix: Modify CommitterImpl to exit early in case of permanent failure #90

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
Jun 2, 2020
Merged

fix: Modify CommitterImpl to exit early in case of permanent failure #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions ...oud-pubsublite/src/main/java/com/google/cloud/pubsublite/internal/wire/CommitterImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ public class CommitterImpl extends ProxyService
@GuardedBy("monitor.monitor")
private boolean shutdown = false;

@GuardedBy("monitor.monitor")
private boolean hadPermanentError = false;

@GuardedBy("monitor.monitor")
private final CommitState state = new CommitState();

Expand Down Expand Up @@ -72,6 +75,7 @@ public CommitterImpl(CursorServiceStub stub, InitialCommitCursorRequest request)
@Override
protected void handlePermanentError(StatusException error) {
try (CloseableMonitor.Hold h = monitor.enter()) {
hadPermanentError = true;
shutdown = true;
state.abort(error);
}
Expand All @@ -90,9 +94,8 @@ protected void stop() {
new Guard(monitor.monitor) {
@Override
public boolean isSatisfied() {
// Wait until the state is empty. It will be made empty by a call to state.abort()
// if an error occurs.
return state.isEmpty();
// Wait until the state is empty or a permanent error occurred.
return state.isEmpty() || hadPermanentError;
}
})) {}
}
Expand Down
17 changes: 17 additions & 0 deletions ...pubsublite/src/test/java/com/google/cloud/pubsublite/internal/wire/CommitterImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import com.google.cloud.pubsublite.ProjectNumber;
import com.google.cloud.pubsublite.SubscriptionName;
import com.google.cloud.pubsublite.SubscriptionPaths;
import com.google.cloud.pubsublite.internal.ExtractStatus;
import com.google.cloud.pubsublite.internal.StatusExceptionMatcher;
import com.google.cloud.pubsublite.proto.CursorServiceGrpc;
import com.google.cloud.pubsublite.proto.CursorServiceGrpc.CursorServiceStub;
Expand All @@ -44,6 +45,7 @@
import com.google.cloud.pubsublite.proto.StreamingCommitCursorRequest;
import com.google.common.util.concurrent.MoreExecutors;
import io.grpc.ManagedChannel;
import io.grpc.Status;
import io.grpc.Status.Code;
import io.grpc.StatusException;
import io.grpc.inprocess.InProcessChannelBuilder;
Expand Down Expand Up @@ -178,4 +180,19 @@ public void multipleSentCompletedInOrder() {

verify(permanentErrorHandler, times(0)).failed(any(), any());
}

@Test
public void stopInCommitCallback() throws Exception {
ApiFuture<Void> future = committer.commitOffset(Offset.of(10));
CountDownLatch latch = new CountDownLatch(1);
ExtractStatus.addFailureHandler(future, (error) -> {
committer.stopAsync();
latch.countDown();
});
leakedResponseObserver.onError(Status.FAILED_PRECONDITION.asException());
latch.await();
assertFutureThrowsCode(future, Code.FAILED_PRECONDITION);
verify(permanentErrorHandler)
.failed(any(), argThat(new StatusExceptionMatcher(Code.FAILED_PRECONDITION)));
}
}