Pub/Sub: publishAll defers sending batches.

sduskis · sduskis · commit fd07e9e34c82 · 2019-04-29T09:52:38.000-04:00
diff --git a/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Publisher.java b/google-cloud-clients/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/v1/Publisher.java
@@ -313,20 +313,22 @@ public void run() {
    */
   public void publishAllOutstanding() {
     messagesBatchLock.lock();
+    List<MessagesBatch> toSend;
     try {
-      for (MessagesBatch batch : messagesBatches.values()) {
-        if (!batch.isEmpty()) {
-          // TODO(kimkyung-goog): Do not release `messagesBatchLock` when publishing a batch. If
-          // it's released, the order of publishing cannot be guaranteed if `publish()` is called
-          // while this function is running. This locking mechanism needs to be improved if it
-          // causes any performance degradation.
-          publishOutstandingBatch(batch.popOutstandingBatch());
-        }
-      }
+      toSend = new ArrayList<>(messagesBatches.values());
       messagesBatches.clear();
     } finally {
       messagesBatchLock.unlock();
     }
+    for (MessagesBatch batch : toSend) {
+      if (!batch.isEmpty()) {
+        // TODO(kimkyung-goog): Do not release `messagesBatchLock` when publishing a batch. If
+        // it's released, the order of publishing cannot be guaranteed if `publish()` is called
+        // while this function is running. This locking mechanism needs to be improved if it
+        // causes any performance degradation.
+        publishOutstandingBatch(batch.popOutstandingBatch());
+      }
+    }
   }
 
   private ApiFuture<PublishResponse> publishCall(OutstandingBatch outstandingBatch) {
