google-cloud-pubsub 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f7dff11d651ad06ca607807388398bbdd150faceaa33b55f12b558159bf3cdf
-  data.tar.gz: 915d9e6a4df2c3def14acc478d4348c5f1a6e7c1d96e5aea5b191f4ed83d2752
+  metadata.gz: 8d3c2b3976af69e59bdb1ea9653f42164db682ce28a929b5325d760c46bab4aa
+  data.tar.gz: 0f922862ba91d39e1ba8f55a66d2a6699392157ed850e129ed127dc9f63ac1d5
 SHA512:
-  metadata.gz: 9dfe9bdd8e1fe239444c5f2a0d3710558cf1ac249e6445a6374896a23b12143ead53e4c437a2dc79750a7630f62a0f6f6541b24499a56070895000da1d3502ca
-  data.tar.gz: a71c2a9bc381c633ad976205423c28688afd0d914bef94814e49b7fa881861f186b9761bd6461c8e910e7d793dd264e2ed2f3a7d4294f214727c90c75ca8c125
+  metadata.gz: d33fdcdb157fa0795e6fc28517ccdd26b8b03b3380dd96bd6f931063eae3ac30a5c4d3b5e9dafd32bbc93ee76e4db3544611c4b1ac9a63ad6068422c9bab466e
+  data.tar.gz: b8218aceaa79d35777e540a43764e7e49474e5dc393c508384f12e4dff09e7d5e1470a8d5a9f2ed6bf96c17d54c63be8489aefbf32babccfeb57a15035867521

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Release History
 
+### 1.0.2 / 2019-10-10
+
+#### Bug Fixes
+
+* Fix Subscriber state after releasing messages
+  * Correctly reset the Subscriber state when releasing messages
+    after the callback either raises an error, or the callback
+    fails to call acknowledge or modify_ack_deadline on the
+    message. If a Subscriber fills it's inventory, and stops
+    pulling additional messages before all the callbacks are
+    completed (moves to a paused state) then the Subscriber
+    could become stuck in a paused state.
+  * A paused Subscriber will now check whether to unpause after
+    the callback is completed, instead of when acknowledge or
+    modify_ack_deadline is called on the message.
+
 ### 1.0.1 / 2019-10-01
 
 #### Bug Fixes

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

@@ -472,7 +472,7 @@ module Google
         end
 
         def inspect
-          "#{self.class}(#{@project})"
+          "#<#{self.class.name} #{@project}>"
         end
 
         protected

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

@@ -292,8 +292,8 @@ module Google
         ##
         # @private
         def to_s
-          format "(subscription: %<sub>s, streams: %<count>i)",
-                 sub: subscription_name, count: streams
+          "(subscription: #{subscription_name}, " \
+            "streams: [#{stream_pool.map(&:to_s).join(', ')}])"
         end
 
         ##

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

@@ -123,7 +123,6 @@ module Google
             synchronize do
               @inventory.remove ack_ids
               @subscriber.buffer.acknowledge ack_ids
-              unpause_streaming!
             end
 
             true
@@ -138,12 +137,27 @@ module Google
             synchronize do
               @inventory.remove mod_ack_ids
               @subscriber.buffer.modify_ack_deadline deadline, mod_ack_ids
-              unpause_streaming!
             end
 
             true
           end
 
+          ##
+          # @private
+          def release *messages
+            ack_ids = coerce_ack_ids messages
+            return if ack_ids.empty?
+
+            synchronize do
+              # Remove from inventory if the message was not explicitly acked or
+              # nacked in the callback
+              @inventory.remove ack_ids
+              # Check whether to unpause the stream only after the callback is
+              # completed and the thread is being reclaimed.
+              unpause_streaming!
+            end
+          end
+
           def push request
             synchronize { @request_queue.push request }
           end
@@ -168,8 +182,8 @@ module Google
 
           # @private
           def to_s
-            format "(inventory: %<inv>i, status: %<sts>s)",
-                   inv: inventory.count, sts: status
+            "(inventory: #{@inventory.count}, " \
+              "status: #{status}, thread: #{thread_status})"
           end
 
           # @private
@@ -279,7 +293,7 @@ module Google
               rescue StandardError => callback_error
                 stream.subscriber.error! callback_error
               ensure
-                stream.inventory.remove msg.ack_id
+                stream.release msg
               end
             end
           end
@@ -342,6 +356,12 @@ module Google
           end
 
           def status
+            return "stopped" if stopped?
+            return "paused" if paused?
+            "running"
+          end
+
+          def thread_status
             return "not started" if @background_thread.nil?
 
             status = @background_thread.status

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

@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module PubSub
-      VERSION = "1.0.1".freeze
+      VERSION = "1.0.2".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: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Mike Moore
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-01 00:00:00.000000000 Z
+date: 2019-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-core