bunny 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbe74ab78378681d5bf1f002e5710b94a1f16c6a
-  data.tar.gz: 8acb0549066633a1e795439f96c8b382318706c1
+  metadata.gz: 65fac851747ba831f48433378fbe43ddfb96c57a
+  data.tar.gz: 3065bffd94f02c19738ea1352f238c223f8f5f90
 SHA512:
-  metadata.gz: ab8f499e08442d75d9fc90d8192868ae6cc27b59369e46b20f2b3669b4d05afbec8a9d2afb897e0dcbabf0b82a96ee6408c9e12c4effa06613dcfd77be408277
-  data.tar.gz: 32b4f57a6bcdee36ced4fd53b9f2725871b15e7d0ead57e6c510fdd359bd13771d473636cdf60280ab2a4ca4402dd385728b2297e046964fba8f0dbc566c3b2b
+  metadata.gz: 78bc0ff879a3d2d94b1f97c55dfb1524cfed7dce6ad37d8c7a32d442de9f2b547df3c05fc243e103c01a5c50558b6fafc7a8b2f7c56c62b6f3c942e42398ad31
+  data.tar.gz: 8aff7680586499e05cadf62da282b08b6866829e468c6aee4126a0da31de6773af93ed7299f36eab2e64c6f0d417b5a0a11984419f92835df6d66aec5f704f22

data/ChangeLog.md

@@ -1,3 +1,11 @@
+## Changes between Bunny 1.6.0 and 1.6.1
+
+### Bunny::Session#with_channel Synchornisation Improvements
+
+`Bunny::Session#with_channel` is now fully synchronised and won't run into `COMMAND_INVALID` errors
+when used from multiple threads that share a connection.
+
+
 ## Changes between Bunny 1.5.0 and 1.6.0
 
 ### TLSv1 by Default

data/lib/bunny/channel.rb

@@ -229,7 +229,8 @@ module Bunny
     # @api public
     def close
       @connection.close_channel(self)
-      closed!
+      @status = :closed
+      @work_pool.shutdown
       maybe_kill_consumer_work_pool!
     end
 

data/lib/bunny/session.rb

@@ -494,6 +494,7 @@ module Bunny
         raise_if_continuation_resulted_in_a_connection_error!
 
         self.unregister_channel(ch)
+        self.release_channel_id(ch.id)
         @last_channel_close_ok
       end
     end

data/lib/bunny/version.rb

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

data/spec/stress/channel_close_stress_spec.rb

@@ -0,0 +1,64 @@
+require "spec_helper"
+
+describe "Rapidly opening and closing lots of channels" do
+  before :all do
+    @connection = Bunny.new(:automatic_recovery => false).tap do |c|
+      c.start
+    end
+  end
+
+  after :all do
+    @connection.close
+  end
+
+  100.times do |i|
+    context "in a multi-threaded scenario A (take #{i})" do
+      let(:n) { 20 }
+
+      it "works correctly" do
+        ts = []
+
+        n.times do
+          t = Thread.new do
+            @connection.with_channel do |ch1|
+              q   = ch1.queue("", :exclusive => true)
+              q.delete
+              ch1.close
+            end
+
+            ch2 = @connection.create_channel
+            ch2.close
+          end
+          t.abort_on_exception = true
+          ts << t
+        end
+
+        ts.each { |t| t.join }
+      end
+    end
+  end
+
+  100.times do |i|
+    context "in a multi-threaded scenario B (take #{i})" do
+      let(:n) { 20 }
+
+      it "works correctly" do
+        ts = []
+
+        n.times do
+          t = Thread.new do
+            3.times do
+              @connection.with_channel do |ch|
+                x  = ch.topic('bunny.stress.topics.t2', :durable => false)
+              end
+            end
+          end
+          t.abort_on_exception = true
+          ts << t
+        end
+
+        ts.each { |t| t.join }
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Chris Duncan
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-31 00:00:00.000000000 Z
+date: 2014-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amq-protocol
@@ -190,6 +190,7 @@ files:
 - spec/lower_level_api/integration/basic_cancel_spec.rb
 - spec/lower_level_api/integration/basic_consume_spec.rb
 - spec/spec_helper.rb
+- spec/stress/channel_close_stress_spec.rb
 - spec/stress/channel_open_stress_spec.rb
 - spec/stress/channel_open_stress_with_single_threaded_connection_spec.rb
 - spec/stress/concurrent_consumers_stress_spec.rb
@@ -290,6 +291,7 @@ test_files:
 - spec/lower_level_api/integration/basic_cancel_spec.rb
 - spec/lower_level_api/integration/basic_consume_spec.rb
 - spec/spec_helper.rb
+- spec/stress/channel_close_stress_spec.rb
 - spec/stress/channel_open_stress_spec.rb
 - spec/stress/channel_open_stress_with_single_threaded_connection_spec.rb
 - spec/stress/concurrent_consumers_stress_spec.rb