rabbitmq-cluster 0.0.6 → 0.0.7

data/Rakefile

@@ -5,3 +5,4 @@ RSpec::Core::RakeTask.new
 
 task :default => :spec
 task :test => :spec
+task :release => :spec

data/bin/rabbitmq-cluster

@@ -11,5 +11,5 @@ server.start
 
 while true do
   server.synchronize
-  sleep 0.5
+  sleep 4
 end

data/lib/rabbitmq/cluster/etcd.rb

@@ -13,19 +13,16 @@ module RabbitMQ::Cluster
     def aquire_lock
       sleep 1 until lock = client.update('/rabbitmq/lock', true, false)
       yield if lock
-      raise unless client.update('/rabbitmq/lock', false, true)
+    ensure
+      client.update('/rabbitmq/lock', false, true)
     end
 
     def nodes
-      (client.get('/rabbitmq/nodes') || {}).values
+      (client.get('/rabbitmq/nodes') || {}).values.sort
     end
 
     def register(node_name)
-      client.set(key_for(node_name), node_name) unless client.exists?(key_for(node_name))
-    end
-
-    def deregister(node_name)
-      client.delete(key_for(node_name))
+      client.set(key_for(node_name), node_name, ttl: 10)
     end
 
     def erlang_cookie

data/lib/rabbitmq/cluster/server.rb

@@ -26,12 +26,12 @@ module RabbitMQ::Cluster
     end
 
     def synchronize
-      return if etcd.nodes.size == running_nodes.size
+      join_cluster if up?
+      return if etcd.nodes == running_nodes
 
       etcd.aquire_lock do
-        stopped_nodes.each do |node|
-          `rabbitmqctl forget_cluster_node #{node['name']}`
-          etcd.deregister(node['name'])
+        stopped_nodes.each do |node_name|
+          system("rabbitmqctl forget_cluster_node #{node_name}")
         end
       end
     end
@@ -41,31 +41,27 @@ module RabbitMQ::Cluster
     end
 
     def up?
-      test_aliveness?
+      client.aliveness_test('/')['status'] == 'ok'
     rescue Faraday::ConnectionFailed
       false
     end
 
     private
 
+    def register
+      etcd.register(name)
+    end
+
     def running_nodes
-      client.nodes.select { |n| n["running"] }
+      nodes(true)
     end
 
     def stopped_nodes
-      client.nodes.select { |n| !n["running"] }
+      nodes(false)
     end
 
-    def test_aliveness?
-      unless client.vhosts.any? {|vh| vh['name'] == 'aliveness-test' }
-        client.vhost_create('aliveness-test')
-      end
-
-      unless client.user_permissions('guest').any? {|up| up['vhost'] == 'aliveness-test' }
-        client.user_set_permissions('guest', 'aliveness-test', '.*', '.*', '.*')
-      end
-
-      client.aliveness_test('aliveness-test')['status'] == 'ok'
+    def nodes(running)
+      client.nodes.select { |n| n["running"] == running }.map { |n| n["name"] }.sort
     end
 
     def join_cluster
@@ -74,7 +70,7 @@ module RabbitMQ::Cluster
         system("rabbitmqctl join_cluster #{nodes_to_join.first}")
         `rabbitmqctl start_app`
       end
-      etcd.register(name)
+      register if up?
     end
 
     def clustered?

data/lib/rabbitmq/cluster/version.rb

@@ -1,5 +1,5 @@
 module RabbitMQ
   module Cluster
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end
 end

data/spec/unit/etcd_spec.rb

@@ -24,44 +24,17 @@ describe RabbitMQ::Cluster::Etcd do
   describe '#register' do
     let(:nodename) { 'rabbit@mynode' }
 
-    context 'the node is not yet registered' do
-
-      before do
-        allow(etcd_client).to receive(:exists?)
-                                .with("/rabbitmq/nodes/#{nodename}")
-      end
-
-      it 'sets the key in etcd' do
-        expect(etcd_client).to receive(:set)
-                                 .with(
-                                   "/rabbitmq/nodes/#{nodename}",
-                                   nodename
-                                 )
-        subject.register(nodename)
-      end
-    end
-
-    context 'the node is allready registered' do
-      before do
-        allow(etcd_client).to receive(:exists?)
-                               .with("/rabbitmq/nodes/#{nodename}")
-                                .and_return true
-      end
-
-      it 'does nothing' do
-        expect(etcd_client).to_not receive(:set)
-        subject.register(nodename)
-      end
+    it 'sets the key in etcd' do
+      expect(etcd_client).to receive(:set)
+      .with(
+        "/rabbitmq/nodes/#{nodename}",
+        nodename,
+        ttl: 10
+      )
+      subject.register(nodename)
     end
   end
 
-  describe '#deregister' do
-    it 'deletes the correct key' do
-      expect(etcd_client).to receive(:delete)
-        .with('/rabbitmq/nodes/rabbit@foobah')
-      subject.deregister('rabbit@foobah')
-    end
-  end
 
   describe '#erlang_cookie' do
     let(:erlang_cookie) { 'afbdgCVB23423bh324h' }
@@ -105,12 +78,6 @@ describe RabbitMQ::Cluster::Etcd do
 
         subject.aquire_lock { thingy.run }
       end
-
-      it 'gets angry if something odd happens' do
-        allow(etcd_client).to receive(:update).with('/rabbitmq/lock', false, true).and_return(false)
-
-        expect { subject.aquire_lock { thingy.run } }.to raise_error
-      end
     end
 
     describe "when we can't get the lock" do
@@ -124,5 +91,17 @@ describe RabbitMQ::Cluster::Etcd do
         subject.aquire_lock { thingy.run }
       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)
+      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
+      end
+    end
   end
 end

data/spec/unit/server_spec.rb

@@ -38,33 +38,6 @@ describe RabbitMQ::Cluster::Server do
     end
 
     context 'we can can connect to the management api' do
-      context 'and the test vhost is allready setup' do
-        before do
-          allow(client).to receive(:vhosts).and_return([{'name' => 'aliveness-test'}])
-          allow(client).to receive(:user_permissions).and_return([{'vhost' => 'aliveness-test'}])
-        end
-
-        it 'wont set up the vhost' do
-          expect(client).to_not receive(:vhost_create)
-          expect(client).to_not receive(:user_set_permissions)
-          subject.up?
-        end
-      end
-
-      context 'and the test vhost is not setup' do
-
-        before do
-          allow(client).to receive(:vhosts).and_return([])
-          allow(client).to receive(:user_permissions).and_return([])
-        end
-
-        it 'will set up the vhost' do
-          expect(client).to receive(:vhost_create).with('aliveness-test')
-          expect(client).to receive(:user_set_permissions).with('guest', 'aliveness-test', '.*', '.*', '.*')
-          subject.up?
-        end
-      end
-
       context 'the aliveness test is working' do
         specify { expect(subject).to be_up }
       end
@@ -97,7 +70,7 @@ describe RabbitMQ::Cluster::Server do
 
     context 'waiting for the server to start' do
       it 'waits until the server has started' do
-        expect(subject).to receive(:up?).twice.and_return(false, true)
+        expect(subject).to receive(:up?).exactly(3).times.and_return(false, true)
         subject.start
       end
     end
@@ -200,49 +173,57 @@ describe RabbitMQ::Cluster::Server do
   describe '#synchronize' do
     context 'etcd has more nodes than are running' do
       before do
-        etcd.register('rabbit@node1')
-        etcd.register('rabbit@node2')
         allow(client).to receive(:nodes)
           .and_return([
             {"name" => "rabbit@node1", "running" => true},
             {"name" => "rabbit@node2", "running" => false}
           ])
-        allow(subject).to receive(:"`")
-        allow(etcd).to receive(:deregister)
+        allow(subject).to receive(:system)
+        allow(client).to receive(:aliveness_test).and_return("status" => "ok")
+        allow(client).to receive(:overview).and_return("cluster_name" => "rabbit@this_node")
       end
 
-      it 'aquires the lock before doing anything' do
-        expect(etcd).to receive(:aquire_lock).and_call_original
-        subject.synchronize
+      context 'the node is up' do
+        it 'registers the node' do
+          expect(etcd).to receive(:register).with('rabbit@this_node')
+          subject.synchronize
+        end
+      end
+
+      context 'the node is not up' do
+        before do
+          allow(client).to receive(:aliveness_test).and_return("status" => "agghghghgh")
+        end
+
+        it 'does not register the node' do
+          expect(etcd).to_not receive(:register).with('rabbit@this_node')
+          subject.synchronize
+        end
       end
 
       it 'removes the stopped node from the cluster' do
-        expect(subject).to receive(:"`")
+        expect(subject).to receive(:system)
           .with('rabbitmqctl forget_cluster_node rabbit@node2')
         subject.synchronize
       end
 
-      it 'removes the stopped node from etcd' do
-        expect(etcd).to receive(:deregister)
-          .with('rabbit@node2')
-        subject.synchronize
-      end
-    end
 
-    context 'etcd has the same nodes as are running' do
-      before do
-        etcd.register('rabbit@node1')
-        etcd.register('rabbit@node2')
-        allow(client).to receive(:nodes)
+      context 'etcd nodes matches running nodes in the cluster' do
+        before do
+          etcd.register('rabbit@node1')
+          etcd.register('rabbit@node2')
+          allow(client).to receive(:nodes)
           .and_return([
-            {"name" => "rabbit@node1", "running" => true},
-            {"name" => "rabbit@node2", "running" => true}
+                      {"name" => "rabbit@node1", "running" => true},
+                      {"name" => "rabbit@node2", "running" => true},
+                      {"name" => "rabbit@this_node", "running" => true}
           ])
-      end
+        end
 
-      it 'does nothing' do
-        expect(etcd).to_not receive(:aquire_lock)
-        subject.synchronize
+        it 'will not remove any nodes' do
+          expect(subject).to_not receive(:system)
+          subject.synchronize
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabbitmq-cluster
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -144,7 +144,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4211619239378065739
+      hash: -4607728886686367057
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4211619239378065739
+      hash: -4607728886686367057
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25