From 14fc9064d55109ef9068e16b0dd898c6dd333c9b Mon Sep 17 00:00:00 2001 From: hannahrogers-google <52459909+hannahrogers-google@users.noreply.github.com> Date: Mon, 21 Jun 2021 15:15:43 -0700 Subject: [PATCH 1/2] fix: allow retries for subscriber unary rpcs --- .../main/java/com/google/cloud/pubsub/v1/Subscriber.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Subscriber.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Subscriber.java index 9de0420ea..a760282a3 100644 --- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Subscriber.java +++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Subscriber.java @@ -97,7 +97,6 @@ public class Subscriber extends AbstractApiService implements SubscriberInterfac 20 * 1024 * 1024; // 20MB API maximum message size. @InternalApi static final int MAX_ACK_DEADLINE_SECONDS = 600; @InternalApi static final int MIN_ACK_DEADLINE_SECONDS = 10; - private static final Duration UNARY_TIMEOUT = Duration.ofSeconds(60); private static final Duration ACK_EXPIRATION_PADDING = Duration.ofSeconds(5); private static final Logger logger = Logger.getLogger(Subscriber.class.getName()); @@ -167,14 +166,6 @@ private Subscriber(Builder builder) { .setTransportChannelProvider(channelProvider) .setHeaderProvider(builder.headerProvider) .setEndpoint(builder.endpoint) - .applyToAllUnaryMethods( - new ApiFunction, Void>() { - @Override - public Void apply(UnaryCallSettings.Builder settingsBuilder) { - settingsBuilder.setSimpleTimeoutNoRetries(UNARY_TIMEOUT); - return null; - } - }) .build(); // TODO(pongad): what about internal header?? } catch (Exception e) { From 12e117675f65915c41710bffb0475f6608b75f6c Mon Sep 17 00:00:00 2001 From: hannahrogers-google <52459909+hannahrogers-google@users.noreply.github.com> Date: Mon, 21 Jun 2021 15:28:51 -0700 Subject: [PATCH 2/2] fix: format --- .../src/main/java/com/google/cloud/pubsub/v1/Subscriber.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Subscriber.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Subscriber.java index a760282a3..656a19fdd 100644 --- a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Subscriber.java +++ b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Subscriber.java @@ -18,7 +18,6 @@ import com.google.api.core.AbstractApiService; import com.google.api.core.ApiClock; -import com.google.api.core.ApiFunction; import com.google.api.core.ApiService; import com.google.api.core.BetaApi; import com.google.api.core.CurrentMillisClock; @@ -35,7 +34,6 @@ import com.google.api.gax.rpc.HeaderProvider; import com.google.api.gax.rpc.NoHeaderProvider; import com.google.api.gax.rpc.TransportChannelProvider; -import com.google.api.gax.rpc.UnaryCallSettings; import com.google.auth.oauth2.GoogleCredentials; import com.google.cloud.pubsub.v1.stub.GrpcSubscriberStub; import com.google.cloud.pubsub.v1.stub.SubscriberStub;