bunny 0.9.0.pre7 → 0.9.0.pre8

data/spec/issues/issue97_spec.rb

@@ -15,21 +15,23 @@ describe "Message framing implementation" do
   end
 
 
-  context "with payload ~ 248K in size including non-ASCII characters" do
-    it "successfully frames the message" do
-      ch = connection.create_channel
+  unless ENV["CI"]
+    context "with payload ~ 248K in size including non-ASCII characters" do
+      it "successfully frames the message" do
+        ch = connection.create_channel
 
-      q  = ch.queue("", :exclusive => true)
-      x  = ch.default_exchange
+        q  = ch.queue("", :exclusive => true)
+        x  = ch.default_exchange
 
-      body = IO.read("spec/issues/issue97_attachment.json")
-      x.publish(body, :routing_key => q.name, :persistent => true)
+        body = IO.read("spec/issues/issue97_attachment.json")
+        x.publish(body, :routing_key => q.name, :persistent => true)
 
-      sleep(1)
-      q.message_count.should == 1
+        sleep(1)
+        q.message_count.should == 1
 
-      q.purge
-      ch.close
+        q.purge
+        ch.close
+      end
     end
   end
 

data/spec/stress/channel_open_stress_spec.rb

@@ -0,0 +1,49 @@
+require "spec_helper"
+
+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
+
+  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"
+
+      xs.size.should == n
+      xs.each do |ch|
+        ch.close
+      end
+    end
+  end
+
+  context "in a multi-threaded scenario" 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.
+    # Because Ruby's mutexes are not re-entrant, it will raise a ThreadError.
+    #
+    # But this already demonstrates that within these platform constraints,
+    # Bunny is safe to use in such scenarios.
+    let(:n) { 50 }
+
+    it "works correctly" do
+      n.times do
+        t = Thread.new do
+          ch = connection.create_channel
+
+          ch.close
+        end
+        t.abort_on_exception = true
+      end
+    end
+  end
+end

data/spec/stress/concurrent_consumers_stress_spec.rb

@@ -0,0 +1,66 @@
+# -*- coding: utf-8 -*-
+require "spec_helper"
+
+describe "Concurrent consumers sharing a connection" 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
+
+  def any_not_drained?(qs)
+    qs.any? { |q| !q.message_count.zero? }
+  end
+
+  context "when publishing thousands of messages over 128K in size" do
+    let(:colors) { ["red", "blue", "white"] }
+
+    let(:n) { 32 }
+    let(:m) { 1000 }
+
+    it "successfully drain all queues" do
+      ch   = connection.create_channel
+      body = "абвг"
+      x    = ch.topic("bunny.stress.concurrent.consumers.topic", :durable => true)
+
+      chs  = {}
+      n.times do |i|
+        chs[i] = connection.create_channel
+      end
+      qs   = []
+
+      n.times do |i|
+        t = Thread.new do
+          cht = chs[i]
+
+          q = cht.queue("", :exclusive => true)
+          q.bind(x.name, :routing_key => colors.sample).subscribe do |delivery_info, meta, payload|
+            # no-op
+          end
+          qs << q
+        end
+        t.abort_on_exception = true
+      end
+
+      sleep 1.0
+
+      5.times do |i|
+        m.times do
+          x.publish(body, :routing_key => colors.sample)
+        end
+        puts "Published #{(i + 1) * m} messages..."
+      end
+
+      while any_not_drained?(qs)
+        sleep 1.0
+      end
+      puts "Drained all the queues..."
+
+      ch.close
+    end
+  end
+end

data/spec/stress/concurrent_publishers_stress_spec.rb

@@ -0,0 +1,58 @@
+# -*- coding: utf-8 -*-
+require "spec_helper"
+
+describe "Concurrent publishers sharing a connection" do
+  let(:connection) do
+    c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed", :automatically_recover => false)
+    c.start
+    c
+  end
+
+  after :all do
+    connection.close
+  end
+
+  let(:n) { 32 }
+  let(:m) { 1000 }
+
+  it "successfully finish publishing" do
+    ch = connection.create_channel
+
+    q    = ch.queue("", :exclusive => true)
+    body = "сообщение"
+
+    # let the queue name be sent back by RabbitMQ
+    sleep 0.25
+
+    chs  = {}
+    n.times do |i|
+      chs[i] = connection.create_channel
+    end
+
+    ts = []
+
+    n.times do |i|
+      t = Thread.new do
+        cht = chs[i]
+        x   = ch.default_exchange
+
+        5.times do |i|
+          m.times do
+            x.publish(body, :routing_key => q.name)
+          end
+          puts "Published #{(i + 1) * m} messages..."
+        end
+      end
+      t.abort_on_exception = true
+
+      ts << t
+    end
+
+    ts.each do |t|
+      t.join
+    end
+
+    sleep 4.0
+    q.message_count.should == 5 * n * m
+  end
+end

data/spec/unit/concurrent/condition_spec.rb

@@ -13,6 +13,7 @@ describe Bunny::Concurrent::Condition do
         sleep 0.25
         condition.notify
       end
+      t.abort_on_exception = true
 
       condition.wait
       xs.should == [:notified]
@@ -28,11 +29,13 @@ describe Bunny::Concurrent::Condition do
         condition.wait
         xs << :notified1
       end
+      t1.abort_on_exception = true
 
       t2 = Thread.new do
         condition.wait
         xs << :notified2
       end
+      t2.abort_on_exception = true
 
       sleep 0.25
       condition.notify
@@ -50,11 +53,13 @@ describe Bunny::Concurrent::Condition do
         condition.wait
         @xs << :notified1
       end
+      t1.abort_on_exception = true
 
       t2 = Thread.new do
         condition.wait
         @xs << :notified2
       end
+      t2.abort_on_exception = true
 
       sleep 0.5
       condition.notify_all

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunny
 version: !ruby/object:Gem::Version
-  version: 0.9.0.pre7
+  version: 0.9.0.pre8
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-02-12 00:00:00.000000000 Z
+date: 2013-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amq-protocol
@@ -64,6 +64,7 @@ files:
 - examples/connection/automatic_recovery_with_multiple_consumers.rb
 - examples/connection/automatic_recovery_with_server_named_queues.rb
 - examples/connection/channel_level_exception.rb
+- examples/connection/disabled_automatic_recovery.rb
 - examples/connection/heartbeat.rb
 - examples/connection/unknown_host.rb
 - examples/guides/exchanges/direct_exchange_routing.rb
@@ -106,6 +107,7 @@ files:
 - lib/bunny/return_info.rb
 - lib/bunny/session.rb
 - lib/bunny/socket.rb
+- lib/bunny/ssl_socket.rb
 - lib/bunny/system_timer.rb
 - lib/bunny/transport.rb
 - lib/bunny/version.rb
@@ -123,9 +125,9 @@ files:
 - spec/higher_level_api/integration/channel_close_spec.rb
 - spec/higher_level_api/integration/channel_flow_spec.rb
 - spec/higher_level_api/integration/channel_open_spec.rb
-- spec/higher_level_api/integration/channel_open_stress_spec.rb
 - spec/higher_level_api/integration/confirm_select_spec.rb
 - spec/higher_level_api/integration/connection_spec.rb
+- spec/higher_level_api/integration/consistent_hash_exchange_spec.rb
 - spec/higher_level_api/integration/consumer_cancellation_notification_spec.rb
 - spec/higher_level_api/integration/dead_lettering_spec.rb
 - spec/higher_level_api/integration/exchange_bind_spec.rb
@@ -144,6 +146,7 @@ files:
 - spec/higher_level_api/integration/sender_selected_distribution_spec.rb
 - spec/higher_level_api/integration/tx_commit_spec.rb
 - spec/higher_level_api/integration/tx_rollback_spec.rb
+- spec/issues/issue100_spec.rb
 - spec/issues/issue78_spec.rb
 - spec/issues/issue83_spec.rb
 - spec/issues/issue97_attachment.json
@@ -151,6 +154,9 @@ 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_open_stress_spec.rb
+- spec/stress/concurrent_consumers_stress_spec.rb
+- spec/stress/concurrent_publishers_stress_spec.rb
 - spec/unit/bunny_spec.rb
 - spec/unit/concurrent/condition_spec.rb
 - spec/unit/transport_spec.rb
@@ -196,9 +202,9 @@ test_files:
 - spec/higher_level_api/integration/channel_close_spec.rb
 - spec/higher_level_api/integration/channel_flow_spec.rb
 - spec/higher_level_api/integration/channel_open_spec.rb
-- spec/higher_level_api/integration/channel_open_stress_spec.rb
 - spec/higher_level_api/integration/confirm_select_spec.rb
 - spec/higher_level_api/integration/connection_spec.rb
+- spec/higher_level_api/integration/consistent_hash_exchange_spec.rb
 - spec/higher_level_api/integration/consumer_cancellation_notification_spec.rb
 - spec/higher_level_api/integration/dead_lettering_spec.rb
 - spec/higher_level_api/integration/exchange_bind_spec.rb
@@ -217,6 +223,7 @@ test_files:
 - spec/higher_level_api/integration/sender_selected_distribution_spec.rb
 - spec/higher_level_api/integration/tx_commit_spec.rb
 - spec/higher_level_api/integration/tx_rollback_spec.rb
+- spec/issues/issue100_spec.rb
 - spec/issues/issue78_spec.rb
 - spec/issues/issue83_spec.rb
 - spec/issues/issue97_attachment.json
@@ -224,6 +231,9 @@ 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_open_stress_spec.rb
+- spec/stress/concurrent_consumers_stress_spec.rb
+- spec/stress/concurrent_publishers_stress_spec.rb
 - spec/unit/bunny_spec.rb
 - spec/unit/concurrent/condition_spec.rb
 - spec/unit/transport_spec.rb

data/spec/higher_level_api/integration/channel_open_stress_spec.rb

@@ -1,22 +0,0 @@
-require "spec_helper"
-
-describe "Rapidly opening and closing lots of channels" do
-  let(:connection) do
-    c = Bunny.new(:user => "bunny_gem", :password => "bunny_password", :vhost => "bunny_testbed")
-    c.start
-    c
-  end
-
-  after :all do
-    connection.close
-  end
-
-  it "works correctly" do
-    xs = Array.new(2000) { connection.create_channel }
-
-    xs.size.should == 2000
-    xs.each do |ch|
-      ch.close
-    end
-  end
-end