bunny 2.6.1 → 2.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d39fdfc39df5c5c84ef856344c2d7242a83b30b7
-  data.tar.gz: a55c5f91d3bd260d400e79f1e9b58e93c70c9e73
+  metadata.gz: a408c8cc518f3c5eda506652d04b7791df76836d
+  data.tar.gz: bb55d125ab3558d5c21292f10e9999a5b6d12a6e
 SHA512:
-  metadata.gz: 0db597e0e7af75a78d584aca113d250f5fa065da89eef1f988d88fa75ca81c7b2ce211f05a28026024c45e3ce32f86c2f958392f831b87fb5fa076bfd58856bd
-  data.tar.gz: 03d130d21a488b3d17edb29e08340a0d4429c2324a1c984afa90e667248ff48145efcaac9bcaeaccaa10aabf04211dbdc6c46c6ee7ba92f07bc4fa34fab1ac35
+  metadata.gz: fef4df3286150c5baca2823526187fc3cec59a41bf54ac23cbac9a58964070882a17866208d1232f8812742647473729b499429bb1fd6ebe9ffcb4676d34c54b
+  data.tar.gz: c7846c6d797c577fb4e34997bf68b4e490893d2e02b12b4e40b5870ab6b028aebdc091be637c4603e8e9d6640bdb14a1cc7056d5cfd5a3335baa33768962c25b

data/.gitignore

@@ -21,3 +21,6 @@ debug/*
 *.dump
 deploy.docs.sh
 .ruby-version
+spec/tls/*.pem
+spec/tls/*.pem~
+spec/tls/*.p12

data/ChangeLog.md

@@ -1,3 +1,9 @@
+## Changes between Bunny 2.6.1 and 2.6.2 (unreleased)
+
+No changes yet.
+
+
+
 ## Changes between Bunny 2.6.0 and 2.6.1 (October 23rd, 2016)
 
 ### Bunny::ConsumerWorkPool#shutdown Terminates Early When It's Safe to Do So

data/Rakefile

@@ -10,6 +10,17 @@ RSpec::Core::RakeTask.new(:integration) do |t|
   t.rspec_opts = "--format progress"
 end
 
+RSpec::Core::RakeTask.new(:integration_without_recovery) do |t|
+  # same as :integration but excludes client connection recovery tests.
+  # useful for sanity checking edge RabbitMQ builds, for instance.
+  t.pattern    = ["spec/higher_level_api/integration", "spec/lower_level_api/integration", "spec/issues"].
+    map { |dir| Dir.glob(File.join(dir, "**", "*_spec.rb")) }.reduce(&:+) -
+    ["spec/higher_level_api/integration/tls_connection_spec.rb",
+     "spec/higher_level_api/integration/connection_recovery_spec.rb"]
+
+  t.rspec_opts = "--format progress"
+end
+
 RSpec::Core::RakeTask.new(:unit) do |t|
   t.pattern    = Dir.glob("spec/unit/**/*_spec.rb")
 

data/lib/bunny/channel.rb

@@ -182,6 +182,9 @@ module Bunny
       @publishing_mutex = @connection.mutex_impl.new
       @consumer_mutex   = @connection.mutex_impl.new
 
+      @queue_mutex    = @connection.mutex_impl.new
+      @exchange_mutex = @connection.mutex_impl.new
+
       @unconfirmed_set_mutex = @connection.mutex_impl.new
 
       self.reset_continuations
@@ -1516,7 +1519,7 @@ module Bunny
     #
     # @api plugin
     def recover_exchanges
-      @exchanges.values.dup.each do |x|
+      @exchange_mutex.synchronize { @exchanges.values }.each do |x|
         x.recover_from_network_failure
       end
     end
@@ -1526,7 +1529,7 @@ module Bunny
     #
     # @api plugin
     def recover_queues
-      @queues.values.dup.each do |q|
+      @queue_mutex.synchronize { @queues.values }.each do |q|
         @logger.debug { "Recovering queue #{q.name}" }
         q.recover_from_network_failure
       end
@@ -1541,7 +1544,8 @@ module Bunny
         @work_pool = ConsumerWorkPool.new(@work_pool.size, @work_pool.abort_on_exception)
         @work_pool.start
       end
-      @consumers.values.dup.each do |c|
+
+      @consumer_mutex.synchronize { @consumers.values }.each do |c|
         c.recover_from_network_failure
       end
     end
@@ -1861,37 +1865,37 @@ module Bunny
 
     # @private
     def deregister_queue(queue)
-      @queues.delete(queue.name)
+      @queue_mutex.synchronize { @queues.delete(queue.name) }
     end
 
     # @private
     def deregister_queue_named(name)
-      @queues.delete(name)
+      @queue_mutex.synchronize { @queues.delete(name) }
     end
 
     # @private
     def register_queue(queue)
-      @queues[queue.name] = queue
+      @queue_mutex.synchronize { @queues[queue.name] = queue }
     end
 
     # @private
     def find_queue(name)
-      @queues[name]
+      @queue_mutex.synchronize { @queues[name] }
     end
 
     # @private
     def deregister_exchange(exchange)
-      @exchanges.delete(exchange.name)
+      @exchange_mutex.synchronize { @exchanges.delete(exchange.name) }
     end
 
     # @private
     def register_exchange(exchange)
-      @exchanges[exchange.name] = exchange
+      @exchange_mutex.synchronize { @exchanges[exchange.name] = exchange }
     end
 
     # @private
     def find_exchange(name)
-      @exchanges[name]
+      @exchange_mutex.synchronize { @exchanges[name] }
     end
 
     protected

data/lib/bunny/session.rb

@@ -276,7 +276,6 @@ module Bunny
     # @see http://rubybunny.info/articles/connecting.html
     # @api public
     def start
-
       return self if connected?
 
       @status_mutex.synchronize { @status = :connecting }
@@ -286,9 +285,7 @@ module Bunny
       self.reset_continuations
 
       begin
-
         begin
-
           # close existing transport if we have one,
           # to not leak sockets
           @transport.maybe_initialize_socket
@@ -496,16 +493,18 @@ module Bunny
 
     # @private
     def open_channel(ch)
-      n = ch.number
-      self.register_channel(ch)
+      @channel_mutex.synchronize do
+        n = ch.number
+        self.register_channel(ch)
 
-      @transport_mutex.synchronize do
-        @transport.send_frame(AMQ::Protocol::Channel::Open.encode(n, AMQ::Protocol::EMPTY_STRING))
-      end
-      @last_channel_open_ok = wait_on_continuations
-      raise_if_continuation_resulted_in_a_connection_error!
+        @transport_mutex.synchronize do
+          @transport.send_frame(AMQ::Protocol::Channel::Open.encode(n, AMQ::Protocol::EMPTY_STRING))
+        end
+        @last_channel_open_ok = wait_on_continuations
+        raise_if_continuation_resulted_in_a_connection_error!
 
-      @last_channel_open_ok
+        @last_channel_open_ok
+      end
     end
 
     # @private
@@ -525,8 +524,10 @@ module Bunny
 
     # @private
     def close_all_channels
-      @channels.reject {|n, ch| n == 0 || !ch.open? }.each do |_, ch|
-        Bunny::Timeout.timeout(@transport.disconnect_timeout, ClientTimeout) { ch.close }
+      @channel_mutex.synchronize do
+        @channels.reject {|n, ch| n == 0 || !ch.open? }.each do |_, ch|
+          Bunny::Timeout.timeout(@transport.disconnect_timeout, ClientTimeout) { ch.close }
+        end
       end
     end
 
@@ -640,8 +641,10 @@ module Bunny
           @recovering_from_network_failure = true
           if recoverable_network_failure?(exception)
             @logger.warn "Recovering from a network failure..."
-            @channels.each do |n, ch|
-              ch.maybe_kill_consumer_work_pool!
+            @channel_mutex.synchronize do
+              @channels.each do |n, ch|
+                ch.maybe_kill_consumer_work_pool!
+              end
             end
             @reader_loop.stop if @reader_loop
             maybe_shutdown_heartbeat_sender
@@ -701,10 +704,12 @@ module Bunny
 
     # @private
     def recover_channels
-      @channels.each do |n, ch|
-        ch.open
+      @channel_mutex.synchronize do
+        @channels.each do |n, ch|
+          ch.open
 
-        ch.recover_from_network_failure
+          ch.recover_from_network_failure
+        end
       end
     end
 
@@ -771,11 +776,11 @@ module Bunny
         options[:hosts] || ["#{DEFAULT_HOST}:#{port_from(options)}"]
       addresses = [addresses] unless addresses.is_a? Array
 
-      addresses.map! do |address|
+      addrs = addresses.map do |address|
         host_with_port?(address) ? address : "#{address}:#{port_from(@opts)}"
       end
 
-      shuffle_strategy.call addresses
+      shuffle_strategy.call(addrs)
     end
 
     # @private

data/lib/bunny/version.rb

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

data/spec/lower_level_api/integration/basic_consume_spec.rb

@@ -93,7 +93,7 @@ describe Bunny::Channel, "#basic_consume" do
 
       expect(ch.queue(queue_name, :auto_delete => true, :durable => false).message_count).to eq 0
 
-      ch.close      
+      ch.close
     end
   end
 end

data/spec/stress/concurrent_publishers_stress_spec.rb

@@ -13,7 +13,7 @@ unless ENV["CI"]
     end
 
     let(:concurrency) { 24 }
-    let(:rate)        { 5_000 }
+    let(:messages)    { 5_000 }
 
     it "successfully finish publishing" do
       body = "сообщение"
@@ -32,10 +32,10 @@ unless ENV["CI"]
           cht = chs[i]
           x   = cht.default_exchange
 
-          rate.times do
+          messages.times do
             x.publish(body)
           end
-          puts "Published #{rate} messages..."
+          puts "Published #{messages} messages..."
           cht.wait_for_confirms
         end
         t.abort_on_exception = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.6.2
 platform: ruby
 authors:
 - Chris Duncan
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-22 00:00:00.000000000 Z
+date: 2016-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amq-protocol
@@ -196,7 +196,6 @@ files:
 - spec/stress/concurrent_publishers_stress_spec.rb
 - spec/stress/connection_open_close_spec.rb
 - spec/stress/long_running_consumer_spec.rb
-- spec/stress/wait_for_confirms_with_connection_loss_stress_spec.rb
 - spec/tls/ca_certificate.pem
 - spec/tls/ca_key.pem
 - spec/tls/client_certificate.pem
@@ -296,7 +295,6 @@ test_files:
 - spec/stress/concurrent_publishers_stress_spec.rb
 - spec/stress/connection_open_close_spec.rb
 - spec/stress/long_running_consumer_spec.rb
-- spec/stress/wait_for_confirms_with_connection_loss_stress_spec.rb
 - spec/tls/ca_certificate.pem
 - spec/tls/ca_key.pem
 - spec/tls/client_certificate.pem
@@ -310,4 +308,3 @@ test_files:
 - spec/unit/concurrent/synchronized_sorted_set_spec.rb
 - spec/unit/exchange_recovery_spec.rb
 - spec/unit/version_delivery_tag_spec.rb
-has_rdoc: true

data/spec/stress/wait_for_confirms_with_connection_loss_stress_spec.rb

@@ -1,131 +0,0 @@
-require "spec_helper"
-
-unless ENV["CI"]
-  describe "Publisher with wait_for_confirms suffering a lost connection" do
-    before :all do
-      @connection = Bunny.new(
-        :user => "bunny_gem",
-        :password => "bunny_password",
-        :vhost => "bunny_testbed",
-        :recover_from_connection_close => true,
-        :network_recovery_interval => 0.2,
-        :recovery_attempts => 3,
-        :continuation_timeout => 3_000)
-      @connection.start
-    end
-
-    after :all do
-      @connection.close
-    end
-
-    let(:rate)        { 50 }
-    let(:inner_rate)  { 5 }
-    let(:max_retries) { 3 }
-    let(:routing_key) { 'confirms' }
-
-    let(:http_client) { RabbitMQ::HTTP::Client.new('http://127.0.0.1:15672') }
-
-    let!(:ch_pub) { @connection.create_channel.tap { |ch| ch.confirm_select } }
-    let!(:ch_sub) { @connection.create_channel }
-    let!(:topic) { 'bunny.stress.concurrent.confirms.topic' }
-    let!(:x) { ch_pub.topic(topic, :durable => true) }
-    let!(:q) do
-      ch_sub.queue('', :durable => true).tap do |q|
-        q.bind(x.name, :routing_key => routing_key)
-        q.purge
-      end
-    end
-
-    def close_all_connections!
-      http_client.list_connections.each do |conn_info|
-        begin
-          http_client.close_connection(conn_info.name)
-        rescue Bunny::ConnectionForced => e
-          # This is not a problem, but the specs intermittently believe it is.
-          printf "Rescued forced connection: #{e.inspect}\n"
-        end
-      end
-    end
-
-    def wait_for_recovery
-      sleep 1.5
-    end
-
-    after do
-      unless ch_sub.closed?
-        q.delete
-        ch_sub.close
-      end
-      ch_pub.close unless ch_pub.closed?
-    end
-
-    it "successfully publish and consume all messages" do
-      begin
-        subscriber_mutex = Mutex.new
-        ids_received = Set.new
-        message_count = nil
-
-        sub = Thread.new do
-          begin
-            q.subscribe do |delivery_info, meta, payload|
-              subscriber_mutex.synchronize do
-                ids_received << payload.to_i
-                message_count = q.message_count
-              end
-            end
-          end
-        end
-        sub.abort_on_exception = true
-
-        pub = Thread.new do
-          rate.times do |i|
-            retries = 0
-            begin
-              inner_rate.times do |j|
-                id = i * inner_rate + j
-                x.publish(id.to_s, :routing_key => routing_key)
-              end
-              until ch_pub.unconfirmed_set.empty?
-                unless ch_pub.wait_for_confirms
-                  raise "Not all messages acknowledged, nacks: #{ch_pub.nacked_set.inspect}"
-                end
-              end
-            rescue => e
-              puts "Rescued error in iteration #{i}: #{e.inspect}"
-              retries += 1
-              raise if retries > max_retries
-
-              puts "sleeping before retry #{retries}"
-              sleep 0.5
-              retry
-            end
-          end
-          puts "Published #{rate * inner_rate} messages..."
-        end
-        pub.abort_on_exception = true
-        sleep 0.2 while ids_received.size < 10
-
-        close_all_connections!
-        wait_for_recovery
-
-        pub.join
-
-        sleep 0.1 until message_count == 0
-        puts "Drained queue, winding down..."
-
-        q.delete
-        ch_pub.close
-        ch_sub.close
-        sub.kill
-
-        expect(ch_pub.unconfirmed_set).to be_empty
-
-        expected_ids = Set.new((rate * inner_rate).times)
-        missing_ids = expected_ids - ids_received
-        expect(missing_ids).to eq(Set.new)
-      ensure
-        sub.kill
-      end
-    end
-  end
-end