google-cloud-pubsub 2.9.1 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b184f3a91a168ccf824158c3b3d394c3bc92802f8086219c2f08b5f4c26217f7
-  data.tar.gz: 06a0cbe8c150187217d4926f4c31c786359299b792bad5b8e00c5213231a3eaf
+  metadata.gz: dfea48d152ed64a8f424def3c0ecdbdc7458da875f12d9ca72aa04a61a682c8c
+  data.tar.gz: b19ac0708ab621f94c90e76fa9819ebd06ef4c4d4afd158b5da185dea5cfbb65
 SHA512:
-  metadata.gz: 86f12e34cb73f559ccd778ef42c5bc31b0e1609b3d8d40be473a2f2a389949978dba7051d77747623408fa84ce18d347ad0509725239e7f257e5a943312f6d05
-  data.tar.gz: 982195c58d4909f682dbcff79529b33570f6808459f813ffa0fecedec9fb3e6c81f811f7ecc01ff986b934abf686646839db80aac1da2fb028e7224a17885453
+  metadata.gz: ccb470b1228bbb234000c74f05396cbfcfe89780557962d4fa5268ad32a164627a48d0a45f605c6cbccdae2944cdf6f6829cb6310c73a0b0fc9de32495a565f4
+  data.tar.gz: 4dbce7523618c04e64ba84231bc9cfce06b9c16026a18c51c451337a7db851c122e47f0e1cc3d07a841ec4fcdd67a1b6ee338c888721b3e77db3b18a9f34948b

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Release History
 
+### 2.10.0 (2022-06-14)
+
+#### Features
+
+* introduce min_duration_per_lease_extension
+
+### 2.9.2 (2022-04-28)
+
+#### Bug Fixes
+
+* ignore grpc errors on ack/modack   
+
 ### 2.9.1 / 2022-01-11
 
 #### Documentation

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

@@ -255,7 +255,11 @@ module Google
         ##
         # Acknowledges receipt of a message.
         def acknowledge subscription, *ack_ids
-          subscriber.acknowledge subscription: subscription_path(subscription), ack_ids: ack_ids
+          begin
+            subscriber.acknowledge subscription: subscription_path(subscription), ack_ids: ack_ids
+          rescue StandardError => e
+            raise e unless e.cause.is_a? GRPC::BadStatus
+          end
         end
 
         ##
@@ -275,9 +279,13 @@ module Google
         ##
         # Modifies the ack deadline for a specific message.
         def modify_ack_deadline subscription, ids, deadline
-          subscriber.modify_ack_deadline subscription:         subscription_path(subscription),
-                                         ack_ids:              Array(ids),
-                                         ack_deadline_seconds: deadline
+          begin
+            subscriber.modify_ack_deadline subscription:         subscription_path(subscription),
+                                           ack_ids:              Array(ids),
+                                           ack_deadline_seconds: deadline
+          rescue StandardError => e
+            raise e unless e.cause.is_a? GRPC::BadStatus
+          end
         end
 
         ##

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

@@ -35,16 +35,18 @@ module Google
           attr_reader :bytesize
           attr_reader :extension
           attr_reader :max_duration_per_lease_extension
+          attr_accessor :min_duration_per_lease_extension
           attr_reader :use_legacy_flow_control
 
           def initialize stream, limit:, bytesize:, extension:, max_duration_per_lease_extension:,
-                         use_legacy_flow_control:
+                         min_duration_per_lease_extension:, use_legacy_flow_control:
             super()
             @stream = stream
             @limit = limit
             @bytesize = bytesize
             @extension = extension
             @max_duration_per_lease_extension = max_duration_per_lease_extension
+            @min_duration_per_lease_extension = min_duration_per_lease_extension
             @use_legacy_flow_control = use_legacy_flow_control
             @inventory = {}
             @wait_cond = new_cond
@@ -162,6 +164,8 @@ module Google
           def calc_delay
             delay = (stream.subscriber.deadline - 3) * rand(0.8..0.9)
             delay = [delay, max_duration_per_lease_extension].min if max_duration_per_lease_extension.positive?
+            delay = [delay, min_duration_per_lease_extension].max if min_duration_per_lease_extension.positive? &&
+                                                                     stream.exactly_once_delivery_enabled
             delay
           end
         end

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

@@ -46,6 +46,10 @@ module Google
           # @private Sequencer.
           attr_reader :sequencer
 
+          ##
+          # @private exactly_once_delivery_enabled.
+          attr_reader :exactly_once_delivery_enabled
+
           ##
           # @private Create an empty Subscriber::Stream object.
           def initialize subscriber
@@ -57,6 +61,7 @@ module Google
             @stopped = nil
             @paused  = nil
             @pause_cond = new_cond
+            @exactly_once_delivery_enabled = false
 
             @inventory = Inventory.new self, **@subscriber.stream_inventory
 
@@ -242,9 +247,13 @@ module Google
               begin
                 # Cannot syncronize the enumerator, causes deadlock
                 response = enum.next
+                new_exactly_once_delivery_enabled = response&.subscription_properties&.exactly_once_delivery_enabled
 
-                # Use synchronize so both changes happen atomically
+                # Use synchronize so changes happen atomically
                 synchronize do
+                  update_min_duration_per_lease_extension new_exactly_once_delivery_enabled
+                  @exactly_once_delivery_enabled = new_exactly_once_delivery_enabled unless new_exactly_once_delivery_enabled.nil? 
+
                   # Create receipt of received messages reception
                   @subscriber.buffer.modify_ack_deadline @subscriber.deadline, response.received_messages.map(&:ack_id)
 
@@ -285,6 +294,14 @@ module Google
 
           # rubocop:enable all
 
+          # 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.
+          def update_min_duration_per_lease_extension new_exactly_once_delivery_enabled
+            return if new_exactly_once_delivery_enabled == @exactly_once_delivery_enabled
+            @inventory.min_duration_per_lease_extension = new_exactly_once_delivery_enabled ? 60 : 0
+          end
+
           def register_callback rec_msg
             if @sequencer
               # Add the message to the sequencer to invoke the callback.

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

@@ -331,6 +331,16 @@ module Google
           @inventory[:max_duration_per_lease_extension]
         end
 
+        ##
+        # The minimum amount of time in seconds for a single lease extension attempt. Bounds the delay before a message
+        # redelivery if the subscriber fails to extend the deadline. Default is 0 (disabled).
+        #
+        # @return [Integer] The minimum number of seconds.
+        #
+        def min_duration_per_lease_extension
+          @inventory[:min_duration_per_lease_extension]
+        end
+
         ##
         # @private
         def stream_inventory
@@ -339,6 +349,7 @@ module Google
             bytesize:                         @inventory[:max_outstanding_bytes].fdiv(@streams).ceil,
             extension:                        @inventory[:max_total_lease_duration],
             max_duration_per_lease_extension: @inventory[:max_duration_per_lease_extension],
+            min_duration_per_lease_extension: @inventory[:min_duration_per_lease_extension],
             use_legacy_flow_control:          @inventory[:use_legacy_flow_control]
           }
         end
@@ -394,6 +405,7 @@ module Google
           @inventory[:max_outstanding_bytes] = Integer(@inventory[:max_outstanding_bytes] || 100_000_000)
           @inventory[:max_total_lease_duration] = Integer(@inventory[:max_total_lease_duration] || 3600)
           @inventory[:max_duration_per_lease_extension] = Integer(@inventory[:max_duration_per_lease_extension] || 0)
+          @inventory[:min_duration_per_lease_extension] = Integer(@inventory[:min_duration_per_lease_extension] || 0)
           @inventory[:use_legacy_flow_control] = @inventory[:use_legacy_flow_control] || false
         end
 

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

@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module PubSub
-      VERSION = "2.9.1".freeze
+      VERSION = "2.10.0".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.9.1
+  version: 2.10.0
 platform: ruby
 authors:
 - Mike Moore
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-11 00:00:00.000000000 Z
+date: 2022-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -276,7 +276,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.4
+rubygems_version: 3.3.14
 signing_key: 
 specification_version: 4
 summary: API Client library for Google Cloud Pub/Sub