google-cloud-pubsub 0.30.1 → 0.30.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a7b5e4f3c773caf36d339a3184ee4307d69722387f315cad6d14180d7240751
-  data.tar.gz: 726c1f954229054c11e5369bbf03b79eda0eddf2695c3073e9f942ea946654ae
+  metadata.gz: 8bc2cbfb8b149d600fbdf725934ccef18019853c3c371d34d964a47532640b33
+  data.tar.gz: 836fae2f33841cd070137fab258d208b456018214a25335f6e7848b1c9e0270b
 SHA512:
-  metadata.gz: 7ecc9df27c7d8fc2a43047d233502a9d14229f2a523f8d65e9d73a81f54fa4b3aa843fd21d2b8d2c4d6bb15daa90e70a258298bbed123f852f799a6f0fd2b6ad
-  data.tar.gz: ed09233e63045916592c796e7b5ef182dbd06c9c4a76350736be955e13cb8cd28c22c9d4fb2c93303dd2c480341632dc4d395309b31f6c9ad23cee61aac93418
+  metadata.gz: 55cf18d0b63d2f68f28db33f85dd21ded29e960e3cd871278b9abfedfa86829b49e3ea6ba96a7ad1fad15f96da65a2d75fb3f9c2dcd59025f1aba753878a79ca
+  data.tar.gz: ce9772ea6d63bc664739c58ee56c32f84c44f9662c6ba9800a9aacd1a7e09eea9757649ca3290f8db894a07a4401ec4fd9f9573d5c4c7230b8e91ac0141c5fb1

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

@@ -285,16 +285,20 @@ module Google
             @publisher = publisher
             @messages = []
             @callbacks = []
+            @total_message_bytes = publisher.topic_name.bytesize + 2
           end
 
           def add msg, callback
             @messages << msg
             @callbacks << callback
+            @total_message_bytes += msg.to_proto.bytesize + 2
           end
 
           def try_add msg, callback
-            if total_message_count + 1 > @publisher.max_messages ||
-               total_message_bytes + msg.to_proto.size >= @publisher.max_bytes
+            new_message_count = total_message_count + 1
+            new_message_bytes = total_message_bytes + msg.to_proto.bytesize + 2
+            if new_message_count > @publisher.max_messages ||
+               new_message_bytes >= @publisher.max_bytes
               return false
             end
             add msg, callback
@@ -311,7 +315,7 @@ module Google
           end
 
           def total_message_bytes
-            @messages.map(&:to_proto).map(&:size).inject(0, :+)
+            @total_message_bytes
           end
 
           def items

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

@@ -162,39 +162,57 @@ module Google
             def initialize max_bytes: 10000000
               @max_bytes = max_bytes
               @request = Google::Pubsub::V1::StreamingPullRequest.new
+              @total_message_bytes = 0
             end
 
             def ack ack_id
               @request.ack_ids << ack_id
+              @total_message_bytes += addl_ack_bytes ack_id
             end
 
             def try_ack ack_id
-              addl_bytes = ack_id.size
+              addl_bytes = addl_ack_bytes ack_id
               return false if total_message_bytes + addl_bytes >= @max_bytes
 
               ack ack_id
               true
             end
 
+            def addl_ack_bytes ack_id
+              ack_id.bytesize + 2
+            end
+
             def delay deadline, ack_id
               @request.modify_deadline_seconds << deadline
               @request.modify_deadline_ack_ids << ack_id
+              @total_message_bytes += addl_delay_bytes deadline, ack_id
             end
 
             def try_delay deadline, ack_id
-              addl_bytes = deadline.to_s.size + ack_id.size
+              addl_bytes = addl_delay_bytes deadline, ack_id
               return false if total_message_bytes + addl_bytes >= @max_bytes
 
               delay deadline, ack_id
               true
             end
 
+            def addl_delay_bytes deadline, ack_id
+              bytes_for_int(deadline) + ack_id.bytesize + 4
+            end
+
+            def bytes_for_int num
+              # Ruby 2.0 does not have Integer#bit_length
+              return [num].pack("s").bytesize unless num.respond_to? :bit_length
+
+              (num.bit_length / 8.0).ceil
+            end
+
             def ready?
               total_message_bytes >= @max_bytes
             end
 
             def total_message_bytes
-              request.to_proto.size
+              @total_message_bytes
             end
           end
         end

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

@@ -230,16 +230,27 @@ module Google
                 break
               end
             end
+            # Has the loop broken but we aren't stopped?
+            # Could be GRPC has thrown an internal error, so restart.
+            synchronize { raise "restart thread" unless @stopped }
           rescue GRPC::DeadlineExceeded, GRPC::Unavailable, GRPC::Cancelled,
-                 GRPC::ResourceExhausted, GRPC::Internal
+                 GRPC::ResourceExhausted, GRPC::Internal, GRPC::Core::CallError
             # The GAPIC layer will raise DeadlineExceeded when stream is opened
             # longer than the timeout value it is configured for. When this
             # happends, restart the stream stealthly.
             # Also stealthly restart the stream on Unavailable, Cancelled,
             # ResourceExhausted, and Internal.
+            # Also, also stealthly restart the stream when GRPC raises the
+            # internal CallError.
             synchronize { start_streaming! }
           rescue StandardError => e
-            raise Google::Cloud::Error.from_error(e)
+            synchronize do
+              if @stopped
+                raise Google::Cloud::Error.from_error(e)
+              else
+                start_streaming!
+              end
+            end
           end
 
           # rubocop:enable all

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

@@ -16,7 +16,7 @@
 module Google
   module Cloud
     module Pubsub
-      VERSION = "0.30.1".freeze
+      VERSION = "0.30.2".freeze
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google-cloud-pubsub
 version: !ruby/object:Gem::Version
-  version: 0.30.1
+  version: 0.30.2
 platform: ruby
 authors:
 - Mike Moore
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-08 00:00:00.000000000 Z
+date: 2018-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-cloud-core