google-cloud-pubsub 2.15.1 → 2.15.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6f6bca71a506686e481d68852eee2813f5b10908b824089e07bf6ad4070d10a
-  data.tar.gz: a52f4f7140448a02c2806ed2d7b04a36b1d62f686cb5d0a62dbfce26670165b6
+  metadata.gz: b87b7780f67e6085a5385cead0cef00b28a2648838f62127077354e4a0f16ce9
+  data.tar.gz: c78f13b82c1482b32a71988acf62d76a9829806cdfcdfa5bff952764438c06f9
 SHA512:
-  metadata.gz: 83662ae6574bf94c38bf19dfc46cda6f6a4fa11b465640ac35794a8ed38f2476244f5be5fb54ef82a1aac90fe4a0b890212e540f5136faaf1b480156d40b2217
-  data.tar.gz: fded200fa64d0f38a047fa3e2ea5bb3d3c204e8e82748b3611e796e2812809b98281865a923ca33ca2d3086d7c7ef72ca0671656813d77805f49b4b7b32f6e9b
+  metadata.gz: be588f7f62da5e5e318674c40e1009e742120444e972fad475727936027b336801f2b8ae460be36c68d5912052d1fe5a577a100617aef31298d7d8312c6a000c
+  data.tar.gz: d79918f0b74eaaf5c393b72231e2d4162536ac0f18c8ac6eb8893d1b49dd0a68fd20e3c6ee8efcd5879a9b0aa7543948ce4c55d1532f58c7939d654b8b579dd1

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Release History
 
+### 2.15.3 (2023-04-19)
+
+#### Bug Fixes
+
+* wait for successful receipt modack when exactly once delivery enabled ([#21431](https://github.com/googleapis/google-cloud-ruby/issues/21431)) 
+
+### 2.15.2 (2023-03-19)
+
+#### Bug Fixes
+
+* make batch handle publish interval ([#20913](https://github.com/googleapis/google-cloud-ruby/issues/20913)) 
+
 ### 2.15.1 (2023-02-23)
 
 #### Documentation

data/lib/google/cloud/pubsub/async_publisher/batch.rb

@@ -141,7 +141,7 @@ module Google
 
               until @queue.empty?
                 item = @queue.first
-                if try_add item.msg, item.callback
+                if try_add item.msg, item.callback, item.create_time
                   @queue.shift
                   next
                 end
@@ -178,12 +178,7 @@ module Google
                 return false
               end
 
-              until @queue.empty?
-                item = @queue.first
-                added = try_add item.msg, item.callback
-                break unless added
-                @queue.shift
-              end
+              refill_items
 
               return false unless @publishing
               if @items.empty?
@@ -191,6 +186,7 @@ module Google
                 return false
               else
                 return true if stopping?
+                return true if interval_met?(@items.first.create_time) || batch_full_by_count?
                 if @queue.empty?
                   @publishing = false
                   return false
@@ -261,16 +257,33 @@ module Google
 
           protected
 
-          def items_add msg, callback
-            item = Item.new msg, callback
+          def interval_met? create_time
+            Time.now - create_time > @publisher.interval
+          end
+
+          def batch_full_by_count?
+            total_message_count == @publisher.max_messages
+          end
+
+          def refill_items
+            until @queue.empty?
+              item = @queue.first
+              added = try_add item.msg, item.callback, item.create_time
+              break unless added
+              @queue.shift
+            end
+          end
+
+          def items_add msg, callback, create_time
+            item = Item.new msg, callback, (create_time || Time.now)
             @items << item
             @total_message_bytes += item.bytesize + 2
           end
 
-          def try_add msg, callback
+          def try_add msg, callback, create_time = nil
             if @items.empty?
               # Always add when empty, even if bytesize is bigger than total
-              items_add msg, callback
+              items_add msg, callback, create_time
               return true
             end
             new_message_count = total_message_count + 1
@@ -279,12 +292,12 @@ module Google
                new_message_bytes >= @publisher.max_bytes
               return false
             end
-            items_add msg, callback
+            items_add msg, callback, create_time
             true
           end
 
           def queue_add msg, callback
-            item = Item.new msg, callback
+            item = Item.new msg, callback, Time.now
             @queue << item
           end
 
@@ -292,7 +305,7 @@ module Google
             @items.count
           end
 
-          Item = Struct.new :msg, :callback do
+          Item = Struct.new :msg, :callback, :create_time do
             def bytesize
               msg.to_proto.bytesize
             end

data/lib/google/cloud/pubsub/subscriber/stream.rb

@@ -248,6 +248,7 @@ module Google
                 # Cannot syncronize the enumerator, causes deadlock
                 response = enum.next
                 new_exactly_once_delivery_enabled = response&.subscription_properties&.exactly_once_delivery_enabled
+                received_messages = response.received_messages
 
                 # Use synchronize so changes happen atomically
                 synchronize do
@@ -256,17 +257,21 @@ module Google
                   @subscriber.exactly_once_delivery_enabled = @exactly_once_delivery_enabled
 
                   # Create receipt of received messages reception
-                  @subscriber.buffer.modify_ack_deadline @subscriber.deadline, response.received_messages.map(&:ack_id)
-
-                  # Add received messages to inventory
-                  @inventory.add response.received_messages
+                  if @exactly_once_delivery_enabled
+                    create_receipt_modack_for_eos received_messages
+                  else
+                    @subscriber.buffer.modify_ack_deadline @subscriber.deadline, received_messages.map(&:ack_id)
+                    # Add received messages to inventory
+                    @inventory.add received_messages
+                  end
                 end
 
-                response.received_messages.each do |rec_msg_grpc|
+                received_messages.each do |rec_msg_grpc|
                   rec_msg = ReceivedMessage.from_grpc(rec_msg_grpc, self)
                   # No need to synchronize the callback future
                   register_callback rec_msg
-                end
+                end if !@exactly_once_delivery_enabled # Exactly once delivery scenario is handled by callback
+                
                 synchronize { pause_streaming! }
               rescue StopIteration
                 break
@@ -295,6 +300,19 @@ module Google
 
           # rubocop:enable all
 
+          def create_receipt_modack_for_eos received_messages
+            received_messages.each do |rec_msg_grpc|
+              callback = proc do |result|
+                if result.succeeded?
+                  synchronize { @inventory.add rec_msg_grpc }
+                  rec_msg = ReceivedMessage.from_grpc rec_msg_grpc, self
+                  register_callback rec_msg
+                end
+              end
+              @subscriber.buffer.modify_ack_deadline @subscriber.deadline, [rec_msg_grpc.ack_id], callback
+            end
+          end
+
           # Updates min_duration_per_lease_extension to 60 when exactly_once_delivery_enabled
           # and reverts back to default 0 when disabled.
           # Skips if exactly_once_enabled is not modified.

data/lib/google/cloud/pubsub/version.rb

@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module PubSub
-      VERSION = "2.15.1".freeze
+      VERSION = "2.15.3".freeze
     end
 
     Pubsub = PubSub unless const_defined? :Pubsub

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-pubsub
 version: !ruby/object:Gem::Version
-  version: 2.15.1
+  version: 2.15.3
 platform: ruby
 authors:
 - Mike Moore
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-23 00:00:00.000000000 Z
+date: 2023-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby