---

pongad · web-flow · commit 295b10fceed1 · 2017-06-06T10:11:26.000+10:00
yaml --- r: 5727 b: refs/heads/master c: 65d5aad h: refs/heads/master i: 5725: d8e048c 5723: 61885b1 5719: 6013975 5711: 0fa716d 5695: 67eb9ab
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: c4c80f54f707f4bce8debf17dd9fd475628e42f1
+refs/heads/master: 65d5aad677ebcfeb81165b02051a44244c44e576
 refs/heads/travis: dae77e558b884bc1b165155482d76c8e40b0fca4
 refs/heads/gh-pages: 3c5e576ef43acaafb4d9c2c093fad59827a77ffa
 refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
diff --git a/trunk/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/Subscriber.java b/trunk/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/Subscriber.java
@@ -335,9 +335,10 @@ private void startConnections(
       List<? extends ApiService> connections, final ApiService.Listener connectionsListener) {
     for (ApiService subscriber : connections) {
       subscriber.addListener(connectionsListener, executor);
-      // Starting each connection submits a blocking task to the executor.
-      // We start connections one at a time to avoid swamping executor with blocking tasks.
-      subscriber.startAsync().awaitRunning();
+      subscriber.startAsync();
+    }
+    for (ApiService subscriber : connections) {
+      subscriber.awaitRunning();
     }
   }
 
@@ -468,10 +469,10 @@ public Builder setCredentialsProvider(CredentialsProvider credentialsProvider) {
     }
 
     /**
-     * Gives the ability to set a custom executor for managing lease extensions. If none is provided
-     * a shared one will be used by all {@link Subscriber} instances.
+     * Gives the ability to set a custom executor for polling and managing lease extensions. If none
+     * is provided a shared one will be used by all {@link Subscriber} instances.
      */
-    public Builder setLeaseAlarmsExecutorProvider(ExecutorProvider executorProvider) {
+    public Builder setSystemExecutorProvider(ExecutorProvider executorProvider) {
       this.systemExecutorProvider = Preconditions.checkNotNull(executorProvider);
       return this;
     }
diff --git a/trunk/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/SubscriberTest.java b/trunk/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/spi/v1/SubscriberTest.java
@@ -536,7 +536,7 @@ private void sendMessages(Iterable<String> ackIds) throws InterruptedException {
   private Builder getTestSubscriberBuilder(MessageReceiver receiver) {
     return Subscriber.defaultBuilder(TEST_SUBSCRIPTION, receiver)
         .setExecutorProvider(FixedExecutorProvider.create(fakeExecutor))
-        .setLeaseAlarmsExecutorProvider(FixedExecutorProvider.create(fakeExecutor))
+        .setSystemExecutorProvider(FixedExecutorProvider.create(fakeExecutor))
         .setChannelProvider(FixedChannelProvider.create(testChannel))
         .setCredentialsProvider(PublisherImplTest.NO_CREDENTIALS_PROVIDER)
         .setClock(fakeExecutor.getClock());
