Skip to content

Pub/Sub: Replacing AutoClosable with BackgrondResource #5710

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
sduskis merged 1 commit into from
Jul 9, 2019
Merged

Pub/Sub: Replacing AutoClosable with BackgrondResource #5710

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
24 changes: 7 additions & 17 deletions ...loud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Subscriber.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,10 @@
import com.google.api.gax.batching.FlowControlSettings;
import com.google.api.gax.batching.FlowController;
import com.google.api.gax.batching.FlowController.LimitExceededBehavior;
import com.google.api.gax.core.BackgroundResource;
import com.google.api.gax.core.CredentialsProvider;
import com.google.api.gax.core.Distribution;
import com.google.api.gax.core.ExecutorAsBackgroundResource;
import com.google.api.gax.core.ExecutorProvider;
import com.google.api.gax.core.InstantiatingExecutorProvider;
import com.google.api.gax.rpc.HeaderProvider;
Expand Down Expand Up @@ -117,7 +119,7 @@ public class Subscriber extends AbstractApiService {
private final MessageReceiver receiver;
private final List<StreamingSubscriberConnection> streamingSubscriberConnections;
private final ApiClock clock;
private final List<AutoCloseable> closeables = new ArrayList<>();
private final List<BackgroundResource> backgroundResources = new ArrayList<>();

private Subscriber(Builder builder) {
receiver = builder.receiver;
Expand All @@ -143,13 +145,7 @@ private Subscriber(Builder builder) {
alarmsExecutor = systemExecutorProvider.getExecutor();

if (systemExecutorProvider.shouldAutoClose()) {
closeables.add(
new AutoCloseable() {
@Override
public void close() {
alarmsExecutor.shutdown();
}
});
backgroundResources.add(new ExecutorAsBackgroundResource((alarmsExecutor)));
}

TransportChannelProvider channelProvider = builder.channelProvider;
Expand Down Expand Up @@ -298,8 +294,8 @@ public void run() {
try {
// stop connection is no-op if connections haven't been started.
stopAllStreamingConnections();
for (AutoCloseable closeable : closeables) {
closeable.close();
for (BackgroundResource resource : backgroundResources) {
resource.shutdown();
}
notifyStopped();
} catch (Exception e) {
Expand All @@ -315,13 +311,7 @@ private void startStreamingConnections() {
for (int i = 0; i < numPullers; i++) {
final ScheduledExecutorService executor = executorProvider.getExecutor();
if (executorProvider.shouldAutoClose()) {
closeables.add(
new AutoCloseable() {
@Override
public void close() {
executor.shutdown();
}
});
backgroundResources.add(new ExecutorAsBackgroundResource((executor)));
}

streamingSubscriberConnections.add(
Expand Down