pr comment

pongad · pongad · commit 6faac7c3a472 · 2017-06-16T16:15:19.000+10:00
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/PollingSubscriberConnection.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/PollingSubscriberConnection.java
@@ -45,7 +45,7 @@
  * Implementation of {@link AckProcessor} based on Cloud Pub/Sub pull and acknowledge operations.
  */
 final class PollingSubscriberConnection extends AbstractApiService implements AckProcessor {
-  static final Duration DEFAULT_TIMEOUT = Duration.ofSeconds(10);
+  static final Duration DEFAULT_TIMEOUT = Duration.ofSeconds(60);
 
   private static final int MAX_PER_REQUEST_CHANGES = 1000;
   private static final int DEFAULT_MAX_MESSAGES = 1000;
diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/FakeSubscriberServiceImpl.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/FakeSubscriberServiceImpl.java
@@ -51,6 +51,7 @@ class FakeSubscriberServiceImpl extends SubscriberImplBase {
   private String subscription = "";
   private final AtomicInteger messageAckDeadline =
       new AtomicInteger(Subscriber.MIN_ACK_DEADLINE_SECONDS);
+  private final AtomicInteger getSubscriptionCalled = new AtomicInteger();
   private final List<Stream> openedStreams = new ArrayList<>();
   private final List<Stream> closedStreams = new ArrayList<>();
   private final List<String> acks = new ArrayList<>();
@@ -225,6 +226,7 @@ public void enqueuePullResponse(PullResponse response) {
   @Override
   public void getSubscription(
       GetSubscriptionRequest request, StreamObserver<Subscription> responseObserver) {
+    getSubscriptionCalled.incrementAndGet();
     responseObserver.onNext(
         Subscription.newBuilder()
             .setName(request.getSubscription())
@@ -234,6 +236,10 @@ public void getSubscription(
     responseObserver.onCompleted();
   }
 
+  public int getSubscriptionCalledNum() {
+    return getSubscriptionCalled.get();
+  }
+
   @Override
   public void pull(PullRequest request, StreamObserver<PullResponse> responseObserver) {
     synchronized (receivedPullRequest) {
diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SubscriberTest.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/SubscriberTest.java
@@ -203,6 +203,18 @@ public void testAckSingleMessage() throws Exception {
     assertEquivalent(testAckIds, fakeSubscriberServiceImpl.waitAndConsumeReceivedAcks(1));
   }
 
+  @Test
+  public void testGetSubscriptionOnce() throws Exception {
+    Subscriber subscriber = startSubscriber(getTestSubscriberBuilder(testReceiver));
+
+    sendMessages(ImmutableList.of("A"));
+
+    // Trigger ack sending
+    subscriber.stopAsync().awaitTerminated();
+
+    assertEquals(1, fakeSubscriberServiceImpl.getSubscriptionCalledNum());
+  }
+
   @Test
   public void testNackSingleMessage() throws Exception {
     Subscriber subscriber = startSubscriber(getTestSubscriberBuilder(testReceiver));
