---

dpcollins-google · sduskis · commit fd594d0b6f62 · 2019-03-04T10:50:40.000-05:00
yaml --- r: 23243 b: refs/heads/autosynth-datastore c: 5e0acc0 h: refs/heads/master i: 23241: 2e6ccfc 23239: a69aacb
diff --git a/[refs] b/[refs]
@@ -127,7 +127,7 @@ refs/heads/autosynth-bigquerystorage: d2c53da3b012e38c662e4df0738042435f19365f
 refs/heads/autosynth-bigtable: 9e5429f45cf9face9fed585d0233534993e36b58
 refs/heads/autosynth-bigtable-admin: 6379a2bc712f2736c83de0e009b4d26da4fa82ca
 refs/heads/autosynth-containeranalysis: af5b804492292b43372c9fe00386696136ccae89
-refs/heads/autosynth-datastore: 4517817a110e3d5230f63ccff810c0644cfab78a
+refs/heads/autosynth-datastore: 5e0acc0913b8608dd896a9e8da1241b8bc251a1d
 refs/heads/autosynth-dialogflow: 7dbc2c1ea714328ccfa4f33645045f017ff080e7
 refs/heads/autosynth-errorreporting: 1101a04e8be074802c35332d5fcf8297f61cae32
 refs/heads/autosynth-firestore: d1a44f9acc302750e37b008ecb9c1aa535cc94df
diff --git a/branches/autosynth-datastore/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageDispatcher.java b/branches/autosynth-datastore/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/MessageDispatcher.java
@@ -371,41 +371,31 @@ public void processReceivedMessages(List<ReceivedMessage> messages, Runnable don
     processOutstandingBatches();
   }
 
-  public void processOutstandingBatches() {
-    while (true) {
-      boolean batchDone = false;
-      Runnable batchCallback = null;
-      OutstandingMessage outstandingMessage;
-      synchronized (outstandingMessageBatches) {
-        OutstandingMessageBatch nextBatch = outstandingMessageBatches.peek();
-        if (nextBatch == null) {
-          return;
-        }
-        outstandingMessage = nextBatch.messages.peek();
-        if (outstandingMessage == null) {
-          return;
-        }
-        try {
-          // This is a non-blocking flow controller.
-          flowController.reserve(
-              1, outstandingMessage.receivedMessage().getMessage().getSerializedSize());
-        } catch (FlowController.MaxOutstandingElementCountReachedException
-            | FlowController.MaxOutstandingRequestBytesReachedException flowControlException) {
-          return;
-        } catch (FlowControlException unexpectedException) {
-          throw new IllegalStateException("Flow control unexpected exception", unexpectedException);
-        }
-        nextBatch.messages.poll(); // We got a hold to the message already.
-        batchDone = nextBatch.messages.isEmpty();
-        if (batchDone) {
-          outstandingMessageBatches.poll();
-          batchCallback = nextBatch.doneCallback;
+  private void processOutstandingBatches() {
+    synchronized (outstandingMessageBatches) {
+      for (OutstandingMessageBatch nextBatch = outstandingMessageBatches.poll();
+          nextBatch != null;
+          nextBatch = outstandingMessageBatches.poll()) {
+        for (OutstandingMessage nextMessage = nextBatch.messages.poll();
+            nextMessage != null;
+            nextMessage = nextBatch.messages.poll()) {
+          try {
+            // This is a non-blocking flow controller.
+            flowController.reserve(1, nextMessage.receivedMessage.getMessage().getSerializedSize());
+          } catch (FlowController.MaxOutstandingElementCountReachedException
+              | FlowController.MaxOutstandingRequestBytesReachedException flowControlException) {
+            // Unwind previous changes in the batches outstanding.
+            nextBatch.messages.addFirst(nextMessage);
+            outstandingMessageBatches.addFirst(nextBatch);
+            return;
+          } catch (FlowControlException unexpectedException) {
+            throw new IllegalStateException(
+                "Flow control unexpected exception", unexpectedException);
+          }
+          processOutstandingMessage(
+              nextMessage.receivedMessage.getMessage(), nextMessage.ackHandler);
         }
-      }
-      processOutstandingMessage(
-          outstandingMessage.receivedMessage.getMessage(), outstandingMessage.ackHandler);
-      if (batchDone) {
-        batchCallback.run();
+        nextBatch.doneCallback.run();
       }
     }
   }
