bunny 1.1.0.rc1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73298a109694af83bb99bf84847d60df16207fcf
-  data.tar.gz: 7b5f3f2aa6f0f790fb9384e1ba08924e6ba60063
+  metadata.gz: 792b20042a60213fee5730fc4bf771dfe034d6bd
+  data.tar.gz: bd74266e1abd735322c449565e7d4041b3a51e09
 SHA512:
-  metadata.gz: bede6aee3aa9976eeb91f016bc7214b90756d96b105e3a81c3214e0497a0500f3c5738af97a0674e028bacbcf9c7cde779dcd8ab4afefef2ba59ad539044885c
-  data.tar.gz: cbcacfc53117c4a3a68e78ce0d3a6c4c817c81780cf2a3f0b5f0ed613a56ed5784d743521e0e535a447612522433136de3950720c8846bbbf2cb54b72a0e1223
+  metadata.gz: 92377d74df1988a233dd3f7f296dd5b9b3b328f38138e7e8b64afc1a0a42e1883945e0f64859ad7309bbf1b30a764ac8025be38cf90b0af93b73306f04baceea
+  data.tar.gz: ca8e3dd099586e3f784b7db55c6a2f8de8c68b279bb0d75ea5f6456e37161c05bab2e613c4120966c5ee98d468e1a07ab387e6fdc281d4e1435478a931c4cf9f

data/ChangeLog.md

@@ -1,3 +1,21 @@
+## Changes between Bunny 1.1.0.rc1 and 1.1.0.rc2
+
+### Synchronized Session#create_channel and Session#close_channel
+
+Full bodies of `Bunny::Session#create_channel` and `Bunny::Session#close_channel`
+are now synchronized, which makes sure concurrent `channel.open` and subsequent
+operations (e.g. `exchange.declare`) do not result in connection-level exceptions
+(incorrect connection state transitions).
+
+### Corrected Recovery Log Message
+
+Bunny will now use actual recovery interval in the log.
+
+Contributed by Chad Fowler.
+
+
+
+
 ## Changes between Bunny 1.1.0.pre2 and 1.1.0.rc1
 
 ### Full Channel State Recovery

data/lib/bunny/channel.rb

@@ -1422,7 +1422,7 @@ module Bunny
       release_all_continuations
 
       recover_prefetch_setting
-      recover_confirm_flag
+      recover_confirm_mode
       recover_tx_mode
       recover_exchanges
       # this includes recovering bindings

data/lib/bunny/session.rb

@@ -275,12 +275,14 @@ module Bunny
     def create_channel(n = nil, consumer_pool_size = 1)
       raise ArgumentError, "channel number 0 is reserved in the protocol and cannot be used" if 0 == n
 
-      if n && (ch = @channels[n])
-        ch
-      else
-        ch = Bunny::Channel.new(self, n, ConsumerWorkPool.new(consumer_pool_size || 1))
-        ch.open
-        ch
+      @channel_mutex.synchronize do
+        if n && (ch = @channels[n])
+          ch
+        else
+          ch = Bunny::Channel.new(self, n, ConsumerWorkPool.new(consumer_pool_size || 1))
+          ch.open
+          ch
+        end
       end
     end
     alias channel create_channel
@@ -470,14 +472,16 @@ module Bunny
 
     # @private
     def close_channel(ch)
-      n = ch.number
+      @channel_mutex.synchronize do
+        n = ch.number
 
-      @transport.send_frame(AMQ::Protocol::Channel::Close.encode(n, 200, "Goodbye", 0, 0))
-      @last_channel_close_ok = wait_on_continuations
-      raise_if_continuation_resulted_in_a_connection_error!
+        @transport.send_frame(AMQ::Protocol::Channel::Close.encode(n, 200, "Goodbye", 0, 0))
+        @last_channel_close_ok = wait_on_continuations
+        raise_if_continuation_resulted_in_a_connection_error!
 
-      self.unregister_channel(ch)
-      @last_channel_close_ok
+        self.unregister_channel(ch)
+        @last_channel_close_ok
+      end
     end
 
     # @private
@@ -636,7 +640,7 @@ module Bunny
           recover_channels
         end
       rescue TCPConnectionFailed, AMQ::Protocol::EmptyResponseError => e
-        @logger.warn "TCP connection failed, reconnecting in 5 seconds"
+        @logger.warn "TCP connection failed, reconnecting in #{@network_recovery_interval} seconds"
         sleep @network_recovery_interval
         retry if recoverable_network_failure?(e)
       end
@@ -807,6 +811,9 @@ module Bunny
     # @private
     def send_frame(frame, signal_activity = true)
       if open?
+        # @transport_mutex.synchronize do
+        #   @transport.write(frame.encode)
+        # end
         @transport.write(frame.encode)
         signal_activity! if signal_activity
       else
@@ -904,7 +911,11 @@ module Bunny
       @logger.debug "Sent connection.start-ok"
 
       frame = begin
-                @transport.read_next_frame
+                fr = @transport.read_next_frame
+                while fr.is_a?(AMQ::Protocol::HeartbeatFrame)
+                  fr = @transport.read_next_frame
+                end
+                fr
                 # frame timeout means the broker has closed the TCP connection, which it
                 # does per 0.9.1 spec.
               rescue Errno::ECONNRESET, ClientTimeout, AMQ::Protocol::EmptyResponseError, EOFError, IOError => e
@@ -946,7 +957,11 @@ module Bunny
       @logger.debug "Sent connection.open with vhost = #{self.vhost}"
 
       frame2 = begin
-                 @transport.read_next_frame
+                 fr = @transport.read_next_frame
+                 while fr.is_a?(AMQ::Protocol::HeartbeatFrame)
+                   fr = @transport.read_next_frame
+                 end
+                 fr
                  # frame timeout means the broker has closed the TCP connection, which it
                  # does per 0.9.1 spec.
                rescue Errno::ECONNRESET, ClientTimeout, AMQ::Protocol::EmptyResponseError, EOFError => e

data/lib/bunny/version.rb

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

data/spec/stress/channel_open_stress_spec.rb

@@ -1,32 +1,26 @@
 require "spec_helper"
 
-unless ENV["CI"]
-  describe "Rapidly opening and closing lots of channels" do
-    let(:connection) do
-      c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed", :automatic_recovery => false)
-      c.start
-      c
-    end
-
-    after :all do
-      connection.close
-    end
+describe "Rapidly opening and closing lots of channels" do
+  connection = Bunny.new(:automatic_recovery => false).tap do |c|
+    c.start
+  end
 
-    context "in a single-threaded scenario" do
-      let(:n) { 500 }
+  context "in a single-threaded scenario" do
+    let(:n) { 500 }
 
-      it "works correctly" do
-        xs = Array.new(n) { connection.create_channel }
-        puts "Opened #{n} channels"
+    it "works correctly" do
+      xs = Array.new(n) { connection.create_channel }
+      puts "Opened #{n} channels"
 
-        xs.size.should == n
-        xs.each do |ch|
-          ch.close
-        end
+      xs.size.should == n
+      xs.each do |ch|
+        ch.close
       end
     end
+  end
 
-    context "in a multi-threaded scenario" do
+  100.times do |i|
+    context "in a multi-threaded scenario A (take #{i})" do
       # actually, on MRI values greater than ~100 will eventually cause write
       # operations to fail with a timeout (1 second is not enough)
       # which will cause recovery to re-acquire @channel_mutex in Session.
@@ -37,14 +31,47 @@ unless ENV["CI"]
       let(:n) { 20 }
 
       it "works correctly" do
+        ts = []
+
         n.times do
           t = Thread.new do
-            ch = connection.create_channel
+            ch1 = connection.create_channel
+            q   = ch1.queue("", :exclusive => true)
+            q.delete
+            ch1.close
 
-            ch.close
+            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
+              ch = connection.create_channel
+              x  = ch.topic('bunny.stress.topics.t2', :durable => false)
+              ch.close
+            end
+          end
+          t.abort_on_exception = true
+          ts << t
+        end
+
+        ts.each { |t| t.join }
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny
 version: !ruby/object:Gem::Version
-  version: 1.1.0.rc1
+  version: 1.1.0
 platform: ruby
 authors:
 - Chris Duncan
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-04 00:00:00.000000000 Z
+date: 2014-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amq-protocol
@@ -221,9 +221,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.1.11