google-cloud-pubsub 2.15.2 → 2.15.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b35d78bd1388f589340f93c8e9b9634e06a82406bfeb7cc134f3f9efe9126316
-  data.tar.gz: 74c1c0be39fcabaed038750157e891da276e13bb5017c57cbb62ccf542139421
+  metadata.gz: b87b7780f67e6085a5385cead0cef00b28a2648838f62127077354e4a0f16ce9
+  data.tar.gz: c78f13b82c1482b32a71988acf62d76a9829806cdfcdfa5bff952764438c06f9
 SHA512:
-  metadata.gz: 066db5f0cd5bdbd207cf8b928bab86dbb9438d7418ad0a596f07547738311ddb8ead880110e1464aeac7b6a90b44d9b54c36b86d3d873c623c866885c948e62f
-  data.tar.gz: 51165f72d1a5813cae65c414915e907b9c15c8e6390ad9ba452b77a42cc6271d6d3b36fc62a97477bed12704d09d76993f0757c6cce8711c0f485eda0e5063f5
+  metadata.gz: be588f7f62da5e5e318674c40e1009e742120444e972fad475727936027b336801f2b8ae460be36c68d5912052d1fe5a577a100617aef31298d7d8312c6a000c
+  data.tar.gz: d79918f0b74eaaf5c393b72231e2d4162536ac0f18c8ac6eb8893d1b49dd0a68fd20e3c6ee8efcd5879a9b0aa7543948ce4c55d1532f58c7939d654b8b579dd1

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # 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

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.2".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.2
+  version: 2.15.3
 platform: ruby
 authors:
 - Mike Moore
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-20 00:00:00.000000000 Z
+date: 2023-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby