bunny 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f18caee12de5783891349254c21dc99fac3bf763
-  data.tar.gz: df8fbda1c395fe0627b0c563d80410aa1064af54
+  metadata.gz: c8f1c8052f218b6d4ed95579a93e03ee9014fea5
+  data.tar.gz: 739d9b25a80d0c6063124229fe8226fe45390ed3
 SHA512:
-  metadata.gz: 2b264d5692cb7840a520c0b101e042fd9c09b98ac2de888afedb2aecbd12d2b5cde655459d25982bc63e987f2b2fc69160744e96f3ccc45f0a35d655883e4559
-  data.tar.gz: de3bc0b5d8ee2118cc8b8ba1bc459f2b4e5f96a3af619d420f2e52a7f86df46ca16dabb4aff99509de8cc4387c1c1bc04dd509637af89353e9b9639764a87b66
+  metadata.gz: 0fe50e8b79c8611edf5f6b3f152b21680fdcb9790bf73126a2c3e4e2bbc38d485b26cef1edf0bde99eca2e8d34c784776396cd4cf8a26829b53ca7974de45430
+  data.tar.gz: 2cb6bf110f3c9508eb055e37c2aebac6ff0915e6d89e014934738b9671041e6b34a9af13aca165d057d296a73efd6f2497efaaa4c0049726b9a362cf31c26e35

data/ChangeLog.md

@@ -1,3 +1,20 @@
+## Changes between Bunny 1.2.0 and 1.2.1
+
+### Better Synchronization for Publisher Confirms
+
+Publisher confirms implementation now synchronizes unconfirmed
+set better.
+
+Contributed by Nicolas Viennot.
+
+### Channel Allocation After Recovery
+
+Channel id allocator is no longer reset after recovery
+if there are channels open. Makes it possible to open channels
+on a recovered connection (in addition to the channels
+it already had).
+
+
 ## Changes between Bunny 1.1.0 and 1.2.0
 
 ### :key Supported in Bunny::Channel#queue_bind

data/lib/bunny/channel.rb

@@ -157,6 +157,9 @@ module Bunny
     # @return [Hash<String, Bunny::Consumer>] Consumer instances declared on this channel
     attr_reader :consumers
 
+    # @return [Integer] active basic.qos prefetch value
+    attr_reader :prefetch_count
+
     DEFAULT_CONTENT_TYPE = "application/octet-stream".freeze
     SHORTSTR_LIMIT = 255
 
@@ -412,8 +415,8 @@ module Bunny
     # @see http://rubybunny.info/articles/exchanges.html Exchanges and Publishing guide
     # @see http://rubybunny.info/articles/queues.html Queues and Consumers guide
     # @api public
-    def prefetch(prefetch_count)
-      self.basic_qos(prefetch_count, false)
+    def prefetch(count)
+      self.basic_qos(count, false)
     end
 
     # Flow control. When set to false, RabbitMQ will stop delivering messages on this
@@ -536,8 +539,10 @@ module Bunny
       opts[:priority]      ||= 0
 
       if @next_publish_seq_no > 0
-        @unconfirmed_set.add(@next_publish_seq_no)
-        @next_publish_seq_no += 1
+        @unconfirmed_set_mutex.synchronize do
+          @unconfirmed_set.add(@next_publish_seq_no)
+          @next_publish_seq_no += 1
+        end
       end
 
       frames = AMQ::Protocol::Basic::Publish.encode(@id,
@@ -604,18 +609,18 @@ module Bunny
     # @see Bunny::Channel#prefetch
     # @see http://rubybunny.info/articles/queues.html Queues and Consumers guide
     # @api public
-    def basic_qos(prefetch_count, global = false)
-      raise ArgumentError.new("prefetch count must be a positive integer, given: #{prefetch_count}") if prefetch_count < 0
+    def basic_qos(count, global = false)
+      raise ArgumentError.new("prefetch count must be a positive integer, given: #{prefetch_count}") if count < 0
       raise_if_no_longer_open!
 
-      @connection.send_frame(AMQ::Protocol::Basic::Qos.encode(@id, 0, prefetch_count, global))
+      @connection.send_frame(AMQ::Protocol::Basic::Qos.encode(@id, 0, count, global))
 
       Bunny::Timeout.timeout(read_write_timeout, ClientTimeout) do
         @last_basic_qos_ok = wait_on_continuations
       end
       raise_if_continuation_resulted_in_a_channel_error!
 
-      @prefetch_count = prefetch_count
+      @prefetch_count = count
 
       @last_basic_qos_ok
     end
@@ -1321,6 +1326,11 @@ module Bunny
       @last_tx_rollback_ok
     end
 
+    # @return [Boolean] true if this channel has transactions enabled
+    def using_tx?
+      !!@tx_mode
+    end
+
     # @endgroup
 
 
@@ -1332,6 +1342,7 @@ module Bunny
     def using_publisher_confirmations?
       @next_publish_seq_no > 0
     end
+    alias using_publisher_confirms? using_publisher_confirmations?
 
     # Enables publisher confirms for the channel.
     # @return [AMQ::Protocol::Confirm::SelectOk] RabbitMQ response
@@ -1681,23 +1692,23 @@ module Bunny
 
     # @private
     def handle_ack_or_nack(delivery_tag, multiple, nack)
-      if nack
-        cloned_set = @unconfirmed_set.clone
+      @unconfirmed_set_mutex.synchronize do
+        if nack
+          cloned_set = @unconfirmed_set.clone
+          if multiple
+            cloned_set.keep_if { |i| i <= delivery_tag }
+            @nacked_set.merge(cloned_set)
+          else
+            @nacked_set.add(delivery_tag)
+          end
+        end
+
         if multiple
-          cloned_set.keep_if { |i| i <= delivery_tag }
-          @nacked_set.merge(cloned_set)
+          @unconfirmed_set.delete_if { |i| i <= delivery_tag }
         else
-          @nacked_set.add(delivery_tag)
+          @unconfirmed_set.delete(delivery_tag)
         end
-      end
-
-      if multiple
-        @unconfirmed_set.delete_if { |i| i <= delivery_tag }
-      else
-        @unconfirmed_set.delete(delivery_tag)
-      end
 
-      @unconfirmed_set_mutex.synchronize do
         @only_acks_received = (@only_acks_received && !nack)
 
         @confirms_continuations.push(true) if @unconfirmed_set.empty?

data/lib/bunny/session.rb

@@ -975,7 +975,11 @@ module Bunny
       @logger.debug "Heartbeat interval negotiation: client = #{@client_heartbeat}, server = #{connection_tune.heartbeat}, result = #{@heartbeat}"
       @logger.info "Heartbeat interval used (in seconds): #{@heartbeat}"
 
-      @channel_id_allocator = ChannelIdAllocator.new(@channel_max)
+      # if there are existing channels we've just recovered from
+      # a network failure and need to fix the allocated set. See issue 205. MK.
+      if @channels.empty?
+        @channel_id_allocator = ChannelIdAllocator.new(@channel_max)
+      end
 
       @transport.send_frame(AMQ::Protocol::Connection::TuneOk.encode(@channel_max, @frame_max, @heartbeat))
       @logger.debug "Sent connection.tune-ok with heartbeat interval = #{@heartbeat}, frame_max = #{@frame_max}, channel_max = #{@channel_max}"

data/lib/bunny/version.rb

@@ -2,5 +2,5 @@
 
 module Bunny
   # @return [String] Version of the library
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/spec/higher_level_api/integration/connection_recovery_spec.rb

@@ -0,0 +1,234 @@
+require "spec_helper"
+require "rabbitmq/http/client"
+
+unless ENV["CI"]
+  describe "Connection recovery" do
+    let(:connection)  {  }
+    let(:http_client) { RabbitMQ::HTTP::Client.new("http://127.0.0.1:15672") }
+
+    def close_all_connections!
+      http_client.list_connections.each do |conn_info|
+        http_client.close_connection(conn_info.name)
+      end
+    end
+
+    def wait_for_recovery
+      sleep 0.7
+    end
+
+    def with_open(c = Bunny.new(:network_recovery_interval => 0.2, :recover_from_connection_close => true), &block)
+      begin
+        c.start
+        block.call(c)
+      ensure
+        c.close
+      end
+    end
+
+    def ensure_queue_recovery(ch, q)
+      q.purge
+      x = ch.default_exchange
+      x.publish("msg", :routing_key => q.name)
+      sleep 0.2
+      q.message_count.should == 1
+      q.purge
+    end
+
+    def ensure_queue_binding_recovery(x, q, routing_key = "")
+      q.purge
+      x.publish("msg", :routing_key => routing_key)
+      sleep 0.2
+      q.message_count.should == 1
+      q.purge
+    end
+
+    def ensure_exchange_binding_recovery(ch, source, destination, routing_key = "")
+      q  = ch.queue("", :exclusive => true)
+      q.bind(destination, :routing_key => routing_key)
+
+      source.publish("msg", :routing_key => routing_key)
+      q.message_count.should == 1
+      q.delete
+    end
+
+    #
+    # Examples
+    #
+
+    it "reconnects after grace period" do
+      with_open do |c|
+        close_all_connections!
+        sleep 0.1
+        c.should_not be_open
+
+        wait_for_recovery
+        c.should be_open
+      end
+    end
+
+    it "recovers channel" do
+      with_open do |c|
+        ch1 = c.create_channel
+        ch2 = c.create_channel
+        close_all_connections!
+        sleep 0.1
+        c.should_not be_open
+
+        wait_for_recovery
+        ch1.should be_open
+        ch2.should be_open
+      end
+    end
+
+    it "recovers basic.qos prefetch setting" do
+      with_open do |c|
+        ch = c.create_channel
+        ch.prefetch(11)
+        ch.prefetch_count.should == 11
+        close_all_connections!
+        sleep 0.1
+        c.should_not be_open
+
+        wait_for_recovery
+        ch.should be_open
+        ch.prefetch_count.should == 11
+      end
+    end
+
+
+    it "recovers publisher confirms setting" do
+      with_open do |c|
+        ch = c.create_channel
+        ch.confirm_select
+        ch.should be_using_publisher_confirms
+        close_all_connections!
+        sleep 0.1
+        c.should_not be_open
+
+        wait_for_recovery
+        ch.should be_open
+        ch.should be_using_publisher_confirms
+      end
+    end
+
+    it "recovers transactionality setting" do
+      with_open do |c|
+        ch = c.create_channel
+        ch.tx_select
+        ch.should be_using_tx
+        close_all_connections!
+        sleep 0.1
+        c.should_not be_open
+
+        wait_for_recovery
+        ch.should be_open
+        ch.should be_using_tx
+      end
+    end
+
+    it "recovers client-named queues" do
+      with_open do |c|
+        ch = c.create_channel
+        q  = ch.queue("bunny.tests.recovery.client-named#{rand}")
+        close_all_connections!
+        sleep 0.1
+        c.should_not be_open
+
+        wait_for_recovery
+        ch.should be_open
+        ensure_queue_recovery(ch, q)
+        q.delete
+      end
+    end
+
+
+    it "recovers server-named queues" do
+      with_open do |c|
+        ch = c.create_channel
+        q  = ch.queue("", :exclusive => true)
+        close_all_connections!
+        sleep 0.1
+        c.should_not be_open
+
+        wait_for_recovery
+        ch.should be_open
+        ensure_queue_recovery(ch, q)
+      end
+    end
+
+    it "recovers queue bindings" do
+      with_open do |c|
+        ch = c.create_channel
+        x  = ch.fanout("amq.fanout")
+        q  = ch.queue("", :exclusive => true)
+        q.bind(x)
+        close_all_connections!
+        sleep 0.1
+        c.should_not be_open
+
+        wait_for_recovery
+        ch.should be_open
+        ensure_queue_binding_recovery(x, q)
+      end
+    end
+
+    it "recovers exchange bindings" do
+      with_open do |c|
+        ch = c.create_channel
+        x  = ch.fanout("amq.fanout")
+        x2 = ch.fanout("bunny.tests.recovery.fanout")
+        x2.bind(x)
+        close_all_connections!
+        sleep 0.1
+        c.should_not be_open
+
+        wait_for_recovery
+        ch.should be_open
+        ensure_exchange_binding_recovery(ch, x, x2)
+      end
+    end
+
+    it "recovers allocated channel ids" do
+      with_open do |c|
+        q = "queue#{Time.now.to_i}"
+        10.times { c.create_channel }
+        c.queue_exists?(q).should be_false
+        close_all_connections!
+        sleep 0.1
+        c.should_not be_open
+
+        wait_for_recovery
+        c.queue_exists?(q).should be_false
+        # make sure the connection isn't closed shortly after
+        # due to "second 'channel.open' seen". MK.
+        c.should be_open
+        sleep 0.1
+        c.should be_open
+        sleep 0.1
+        c.should be_open
+      end
+    end
+
+    it "recovers consumer" do
+      with_open do |c|
+        delivered = false
+
+        ch = c.create_channel
+        q  = ch.queue("", :exclusive => true)
+        q.subscribe do |_, _, _|
+          delivered = true
+        end
+        close_all_connections!
+        sleep 0.1
+        c.should_not be_open
+
+        wait_for_recovery
+        ch.should be_open
+
+        q.publish("")
+        sleep 0.5
+        expect(delivered).to be_true
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Chris Duncan
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-09 00:00:00.000000000 Z
+date: 2014-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amq-protocol
@@ -152,6 +152,7 @@ files:
 - spec/higher_level_api/integration/channel_close_spec.rb
 - spec/higher_level_api/integration/channel_open_spec.rb
 - spec/higher_level_api/integration/confirm_select_spec.rb
+- spec/higher_level_api/integration/connection_recovery_spec.rb
 - spec/higher_level_api/integration/connection_spec.rb
 - spec/higher_level_api/integration/connection_stop_spec.rb
 - spec/higher_level_api/integration/consistent_hash_exchange_spec.rb
@@ -248,6 +249,7 @@ test_files:
 - spec/higher_level_api/integration/channel_close_spec.rb
 - spec/higher_level_api/integration/channel_open_spec.rb
 - spec/higher_level_api/integration/confirm_select_spec.rb
+- spec/higher_level_api/integration/connection_recovery_spec.rb
 - spec/higher_level_api/integration/connection_spec.rb
 - spec/higher_level_api/integration/connection_stop_spec.rb
 - spec/higher_level_api/integration/consistent_hash_exchange_spec.rb