rabbitmq-cluster 0.0.18 → 0.0.19

data/lib/rabbitmq/cluster/etcd.rb

@@ -7,39 +7,43 @@ class RabbitMQ::Cluster
 
     def self.build
       new(
-        ::Etcd::Client.new(uri: ENV['ETCD_HOST'])
+        ::Etcd::Client.new(host: ENV['ETCD_HOST'])
       )
     end
 
     def initialize(client)
       self.client = client
-      client.connect
     end
 
-    def aquire_lock
-      with_retry do
-        sleep 1 until lock = client.update('/rabbitmq/lock', true, false)
-      end
+    def acquire_lock
+      client.compare_and_swap('/rabbitmq/lock', value: true, prevValue: false)
       yield
+    rescue ::Etcd::TestFailed
+      client.watch('/rabbitmq/lock')
+      retry
     ensure
-      client.update('/rabbitmq/lock', false, true)
+      client.set('/rabbitmq/lock', value: false)
     end
 
     def nodes
       with_retry do
-        (client.get('/rabbitmq/nodes') || {}).values.sort
+        begin
+          client.get('/rabbitmq/nodes').children.map(&:value).sort
+        rescue ::Etcd::KeyNotFound
+          []
+        end
       end
     end
 
     def register(node_name, wait=nil)
       with_retry(wait) do
-        client.set(key_for(node_name), node_name, ttl: 10)
+        client.set(key_for(node_name), value: node_name, ttl: 10)
       end
     end
 
     def erlang_cookie
       with_retry do
-        client.get('/rabbitmq/erlang_cookie')
+        client.get('/rabbitmq/erlang_cookie').value
       end
     end
 
@@ -47,7 +51,7 @@ class RabbitMQ::Cluster
       with_retry do
         client.set(
           '/rabbitmq/erlang_cookie',
-          erlang_cookie
+          value: erlang_cookie
         )
       end
     end

data/lib/rabbitmq/cluster/server.rb

@@ -62,7 +62,7 @@ class RabbitMQ::Cluster
     end
 
     def remove_stopped_nodes
-      etcd.aquire_lock do
+      etcd.acquire_lock do
         stopped_nodes.each do |node_name|
           system("rabbitmqctl forget_cluster_node #{node_name}")
         end

data/lib/rabbitmq/cluster/version.rb

@@ -1,5 +1,5 @@
 module RabbitMQ
   class Cluster
-    VERSION = "0.0.18"
+    VERSION = "0.0.19"
   end
 end

data/rabbitmq-cluster.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'rabbitmq_manager'
-  spec.add_dependency 'etcd-rb'
+  spec.add_dependency 'etcd'
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"

data/spec/unit/etcd_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe RabbitMQ::Cluster::Etcd do
-  let(:etcd_client) { double(:etcd, connect: true) }
+  let(:etcd_client) { double(:etcd) }
   subject { described_class.new(etcd_client) }
 
   describe '.build' do
@@ -18,16 +18,25 @@ describe RabbitMQ::Cluster::Etcd do
   describe '#nodes' do
     it 'returns the list of nodes registed in etcd' do
       allow(etcd_client).to receive(:get).with('/rabbitmq/nodes').and_return(
-        {
-          "/rabbitmq/nodes/rabbit@rabbit1" => "rabbit@rabbit1",
-          "/rabbitmq/nodes/rabbit@rabbit2" => "rabbit@rabbit2"
-        }
+        double(:response,
+               children: [
+                 double(:response, value: "rabbit@rabbit1"),
+                 double(:response, value: "rabbit@rabbit2")
+               ]
+              )
       )
       expect(subject.nodes).to eq ["rabbit@rabbit1", "rabbit@rabbit2"]
     end
 
     it 'returns an empty array if there are no nodes registered' do
-      allow(etcd_client).to receive(:get).with('/rabbitmq/nodes')
+      allow(etcd_client).to receive(:get).with('/rabbitmq/nodes').and_return(
+        double(:response, children: [])
+      )
+      expect(subject.nodes).to eq []
+    end
+
+    it 'returns an empty array if the nodes directory has not been created' do
+      allow(etcd_client).to receive(:get).with('/rabbitmq/nodes').and_raise(Etcd::KeyNotFound)
       expect(subject.nodes).to eq []
     end
   end
@@ -39,7 +48,7 @@ describe RabbitMQ::Cluster::Etcd do
       expect(etcd_client).to receive(:set)
       .with(
         "/rabbitmq/nodes/#{nodename}",
-        nodename,
+        value: nodename,
         ttl: 10
       )
       subject.register(nodename)
@@ -63,7 +72,7 @@ describe RabbitMQ::Cluster::Etcd do
     before do
       allow(etcd_client).to receive(:get)
                               .with('/rabbitmq/erlang_cookie')
-                              .and_return(erlang_cookie)
+                              .and_return(double(:response, value: erlang_cookie))
     end
 
     it 'has a getter' do
@@ -74,55 +83,50 @@ describe RabbitMQ::Cluster::Etcd do
       expect(etcd_client).to receive(:set)
                                .with(
                                  '/rabbitmq/erlang_cookie',
-                                 erlang_cookie
+                                 value: erlang_cookie
                                )
       subject.erlang_cookie = erlang_cookie
     end
   end
 
-  describe '#aquire_lock' do
-    let(:thingy) { double(run: nil) }
+  describe '#acquire_lock' do
     before do
-      allow(etcd_client).to receive(:update).with('/rabbitmq/lock', false, true).and_return(true)
-      allow(etcd_client).to receive(:update).with('/rabbitmq/lock', true, false).and_return(true)
+      allow(etcd_client).to receive(:compare_and_swap).with('/rabbitmq/lock', value: true, prevValue: false)
+      allow(etcd_client).to receive(:set).with('/rabbitmq/lock', value: false)
     end
 
     describe 'when we can get the lock' do
       it 'runs the code' do
-        expect(etcd_client).to receive(:update).with('/rabbitmq/lock', true, false).and_return(true)
-        expect(thingy).to receive(:run)
-
-        subject.aquire_lock { thingy.run }
+        expect(etcd_client).to receive(:compare_and_swap).with('/rabbitmq/lock', value: true, prevValue: false)
+        expect { |b| subject.acquire_lock(&b) }.to yield_control
       end
 
       it 'gives the lock back when its done' do
-        expect(etcd_client).to receive(:update).with('/rabbitmq/lock', false, true).and_return(true)
-
-        subject.aquire_lock { thingy.run }
+        expect(etcd_client).to receive(:set).with('/rabbitmq/lock', value: false)
+        expect { |b| subject.acquire_lock(&b) }.to yield_control
       end
     end
 
     describe "when we can't get the lock" do
-      it 'retries till the lock can be aquired' do
-        expect(etcd_client).to receive(:update)
-                                 .with('/rabbitmq/lock', true, false)
-                                 .at_least(3).times
-                                 .and_return(false, false, true)
-        expect(thingy).to receive(:run)
-
-        subject.aquire_lock { thingy.run }
+      it 'retries till the lock can be acquired' do
+        allow(etcd_client).to receive(:watch)
+        call_count = 0
+        expect(etcd_client).to receive(:compare_and_swap).with('/rabbitmq/lock', value: true, prevValue: false) do
+          call_count += 1
+          raise Etcd::TestFailed unless call_count == 3
+        end
+        expect { |b| subject.acquire_lock(&b) }.to yield_control
       end
     end
 
     describe 'when something explodes' do
       before do
-        allow(etcd_client).to receive(:update).with('/rabbitmq/lock', false, true).and_return(true)
-        allow(etcd_client).to receive(:update).with('/rabbitmq/lock', true, false).and_return(true)
+        allow(etcd_client).to receive(:compare_and_swap)
       end
 
       it 'gives the lock back' do
-        expect(etcd_client).to receive(:update).with('/rabbitmq/lock', false, true).and_return(true)
-        expect { subject.aquire_lock { fail } }.to raise_error
+        expect(etcd_client).to receive(:set).with('/rabbitmq/lock', value: false)
+        expect { subject.acquire_lock { fail } }.to raise_error
       end
     end
   end

data/spec/unit/server_spec.rb

@@ -229,7 +229,7 @@ class FakeEtcd
     self.nodes = []
   end
 
-  def aquire_lock
+  def acquire_lock
     yield
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabbitmq-cluster
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-12 00:00:00.000000000 Z
+date: 2014-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rabbitmq_manager
@@ -28,7 +28,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: etcd-rb
+  name: etcd
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -148,7 +148,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1450647500986372266
+      hash: -1414004565124595041
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1450647500986372266
+      hash: -1414004565124595041
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25