pubsub: fix testModifyAckDeadline flaking, maybe

pongad · pongad · commit b7ba60b0d568 · 2017-02-15T16:09:18.000+11:00
Previously MessageDispatcher starts off with deadline duration of 0.
Since we need to extend deadline before the time is up,
the client extends deadline a little before the deadline.
This translates to scheduling deadling extension "in the past".

In turn, this causes tasks to be run -- and new tasks scheduled --
without explicit calls to advance the time on the fake clock.
So, when the test code actually advance the fake clock,
it runs more tasks than it wants to.

This PR conservatively sets the initial deadline duration to 10 seconds.
This is already the default in streaming version.
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/PollingSubscriberConnection.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/PollingSubscriberConnection.java
@@ -90,6 +90,7 @@ public PollingSubscriberConnection(
             flowController,
             executor,
             clock);
+    messageDispatcher.setMessageDeadlineSeconds(Subscriber.MIN_ACK_DEADLINE_SECONDS);
   }
 
   @Override
diff --git a/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/Subscriber.java b/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/Subscriber.java
@@ -113,7 +113,7 @@ public class Subscriber {
       20 * 1024 * 1024; // 20MB API maximum message size.
   private static final int INITIAL_ACK_DEADLINE_SECONDS = 10;
   private static final int MAX_ACK_DEADLINE_SECONDS = 600;
-  private static final int MIN_ACK_DEADLINE_SECONDS = 10;
+  static final int MIN_ACK_DEADLINE_SECONDS = 10;
   private static final Duration ACK_DEADLINE_UPDATE_PERIOD = Duration.standardMinutes(1);
   private static final double PERCENTILE_FOR_ACK_DEADLINE_UPDATES = 99.9;
 
diff --git a/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/FakeSubscriberServiceImpl.java b/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/FakeSubscriberServiceImpl.java
@@ -49,7 +49,7 @@
 class FakeSubscriberServiceImpl extends SubscriberImplBase {
   private final AtomicBoolean subscriptionInitialized = new AtomicBoolean(false);
   private String subscription = "";
-  private final AtomicInteger messageAckDeadline = new AtomicInteger();
+  private final AtomicInteger messageAckDeadline = new AtomicInteger(Subscriber.MIN_ACK_DEADLINE_SECONDS);
   private final List<Stream> openedStreams = new ArrayList<>();
   private final List<Stream> closedStreams = new ArrayList<>();
   private final List<String> acks = new ArrayList<>();

Original file line number	Diff line number	Diff line change
`@@ -90,6 +90,7 @@ public PollingSubscriberConnection(`
`90`	`90`	`flowController,`
`91`	`91`	`executor,`
`92`	`92`	`clock);`
	`93`	`+ messageDispatcher.setMessageDeadlineSeconds(Subscriber.MIN_ACK_DEADLINE_SECONDS);`
`93`	`94`	`}`
`94`	`95`
`95`	`96`	`@Override`