rabbitmq-cluster 0.0.13 → 0.0.14

data/bin/rabbitmq-cluster

@@ -1,7 +1,6 @@
 require 'rabbitmq/cluster'
 
 server = RabbitMQ::Cluster::Server.build
-server.start
 
 while true do
   server.synchronize

data/bin/rabbitmq-cluster-prestart

@@ -0,0 +1,4 @@
+require 'rabbitmq/cluster'
+
+server = RabbitMQ::Cluster::Server.build
+server.prestart

data/lib/rabbitmq/cluster.rb

@@ -2,7 +2,6 @@ require "rabbitmq/cluster/version"
 require "rabbitmq/cluster/server"
 
 module RabbitMQ
-  module Cluster
-    # Your code goes here...
+  class Cluster
   end
 end

data/lib/rabbitmq/cluster/etcd.rb

@@ -1,6 +1,6 @@
 require 'etcd'
 
-module RabbitMQ::Cluster
+class RabbitMQ::Cluster
   class Etcd
     attr_accessor :client
     private :client

data/lib/rabbitmq/cluster/server.rb

@@ -7,7 +7,7 @@ class RabbitMQManager
   end
 end
 
-module RabbitMQ::Cluster
+class RabbitMQ::Cluster
   class Server
     attr_accessor :client, :etcd
     private :client, :etcd
@@ -24,18 +24,13 @@ module RabbitMQ::Cluster
       self.etcd = etcd
     end
 
-    def start
-      etcd.aquire_lock do
-        setup_erlang_cookie
-        start_rabbitmq_server
-        save_erlang_cookie
-        join_cluster
-      end
+    def prestart
+      setup_erlang_cookie
     end
 
     def synchronize
-      remove_stopped_nodes if stopped_nodes.any?
       join_cluster
+      remove_stopped_nodes if stopped_nodes.any?
     end
 
     def healthcheck
@@ -95,32 +90,11 @@ module RabbitMQ::Cluster
       etcd.nodes - [name]
     end
 
-    def start_rabbitmq_server
-      system("/usr/sbin/rabbitmq-server &")
-      waits = 1
-      until up?
-        sleep waits
-        waits *= 2
-      end
-    end
-
-    def erlang_cookie
-      IO.read('/var/lib/rabbitmq/.erlang.cookie')
-    end
-
     def setup_erlang_cookie
-      if etcd.erlang_cookie
-        File.open('/var/lib/rabbitmq/.erlang.cookie', 'w') { |file| file.write etcd.erlang_cookie }
-        `chown rabbitmq:rabbitmq /var/lib/rabbitmq/.erlang.cookie`
-        `chmod 400 /var/lib/rabbitmq/.erlang.cookie`
-      end
+      fail "erlang cookie must be preset in etcd" unless etcd.erlang_cookie
+      File.open('/var/lib/rabbitmq/.erlang.cookie', 'w') { |file| file.write etcd.erlang_cookie }
+      `chown rabbitmq:rabbitmq /var/lib/rabbitmq/.erlang.cookie`
+      `chmod 400 /var/lib/rabbitmq/.erlang.cookie`
     end
-
-    def save_erlang_cookie
-      unless etcd.erlang_cookie
-        etcd.erlang_cookie = erlang_cookie
-      end
-    end
-
   end
 end

data/lib/rabbitmq/cluster/version.rb

@@ -1,5 +1,5 @@
 module RabbitMQ
-  module Cluster
-    VERSION = "0.0.13"
+  class Cluster
+    VERSION = "0.0.14"
   end
 end

data/spec/unit/server_spec.rb

@@ -64,41 +64,92 @@ describe RabbitMQ::Cluster::Server do
     end
   end
 
-  describe 'starting the server' do
-    let(:client) { double(:client).as_null_object }
 
+  describe '#prestart' do
+    context 'with an erlang cookie in etcd' do
+      before do
+        allow(File).to receive(:open)
+        allow(subject).to receive(:"`")
+        allow(etcd).to receive(:erlang_cookie).and_return('NummmNugnnmNuyum')
+      end
+
+      it 'sets up the erlang cookie' do
+        expect(File).to receive(:open).with('/var/lib/rabbitmq/.erlang.cookie', 'w')
+        subject.prestart
+      end
+
+      it 'sets up the ownership and permissions of the erlang cooke' do
+        expect(subject).to receive(:"`")
+          .with("chown rabbitmq:rabbitmq /var/lib/rabbitmq/.erlang.cookie")
+        expect(subject).to receive(:"`")
+          .with("chmod 400 /var/lib/rabbitmq/.erlang.cookie")
+        subject.prestart
+      end
+    end
+
+    context 'when there was no erlang cookie in etcd' do
+      before do
+        allow(etcd).to receive(:erlang_cookie).and_return(false)
+      end
+
+      it 'fails hard and fast' do
+        expect { subject.prestart }.to raise_error('erlang cookie must be preset in etcd')
+      end
+    end
+  end
+
+  describe '#synchronize' do
     before do
+      allow(client).to receive(:nodes)
+      .and_return([
+                  {"name" => "rabbit@node1", "running" => true},
+                  {"name" => "rabbit@node2", "running" => false}
+      ])
       allow(subject).to receive(:system)
-      allow(client).to receive(:aliveness_test).and_return({ "status" => "ok" })
-      allow(File).to receive(:open)
-      allow(IO).to receive(:read)
-      allow(subject).to receive(:"`")
+      allow(client).to receive(:aliveness_test).and_return("status" => "ok")
+      allow(client).to receive(:overview).and_return("node" => "rabbit@this_node")
     end
 
-    it 'shells out to start rabbitmq-server' do
-      expect(subject).to receive(:system).with("/usr/sbin/rabbitmq-server &")
-      subject.start
+    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
 
-    context 'waiting for the server to start' do
-      it 'waits until the server has started' do
-        expect(subject).to receive(:up?).exactly(2).times.and_return(false, true)
-        subject.start
+    context 'the node is up' do
+      it 'removes the stopped node from the cluster' do
+        expect(subject).to receive(:system)
+        .with('rabbitmqctl forget_cluster_node rabbit@node2')
+        subject.synchronize
       end
     end
 
     describe 'joining the cluster' do
+      let(:client) { double(:client).as_null_object }
+
+      before do
+        allow(subject).to receive(:system)
+        allow(subject).to receive(:"`")
+        allow(client).to receive(:aliveness_test).and_return({ "status" => "ok" })
+      end
+
+
       context 'with no nodes in etcd' do
         it 'does nothing' do
           expect(subject).to_not receive(:"`")
-          subject.start
+          subject.synchronize
         end
       end
 
       context 'with some nodes allready in etcd' do
         before do
           allow(client).to receive(:nodes)
-            .and_return([{}])
+          .and_return([{}])
           etcd.register('rabbit@node1')
           etcd.register('rabbit@node2')
         end
@@ -106,122 +157,39 @@ describe RabbitMQ::Cluster::Server do
         context 'allready in a cluster' do
           before do
             allow(client).to receive(:nodes)
-              .and_return([{},{}])
+            .and_return([{},{}])
           end
 
           it 'does nothing' do
             expect(subject).to_not receive(:"`")
-            subject.start
+            expect(subject).to_not receive(:system)
+            subject.synchronize
           end
         end
 
         it 'tries to join the cluster' do
           expect(subject).to receive(:system).with("rabbitmqctl join_cluster rabbit@node1")
-          subject.start
+          subject.synchronize
         end
 
         it 'stops the management app before clustering' do
           expect(subject).to receive(:"`")
-                               .with('rabbitmqctl stop_app')
+          .with('rabbitmqctl stop_app')
           expect(subject).to receive(:"`")
-                               .with('rabbitmqctl start_app')
-          subject.start
+          .with('rabbitmqctl start_app')
+          subject.synchronize
         end
 
         it 'does not try to cluster with itself' do
           allow(client).to receive(:overview).and_return('node' => 'rabbit@node1')
           expect(subject).to receive(:system).with("rabbitmqctl join_cluster rabbit@node2")
-          subject.start
+          subject.synchronize
         end
 
         it 'registers itself' do
           allow(client).to receive(:overview).and_return('node' => 'rabbit@this_node')
-          subject.start
-          expect(etcd.nodes).to include('rabbit@this_node')
-        end
-      end
-    end
-
-    context 'with an erlang cookie in etcd' do
-
-      before do
-        allow(etcd).to receive(:erlang_cookie).and_return('NummmNugnnmNuyum')
-      end
-
-      it 'sets up the erlang cookie' do
-        expect(File).to receive(:open).with('/var/lib/rabbitmq/.erlang.cookie', 'w')
-        subject.start
-      end
-
-      it 'sets up the ownership and permissions of the erlang cooke' do
-        expect(subject).to receive(:"`")
-        .with("chown rabbitmq:rabbitmq /var/lib/rabbitmq/.erlang.cookie")
-        expect(subject).to receive(:"`")
-        .with("chmod 400 /var/lib/rabbitmq/.erlang.cookie")
-        subject.start
-      end
-    end
-
-    context 'when there was no erlang cookie in etcd' do
-      before do
-        allow(IO).to receive(:read)
-          .with('/var/lib/rabbitmq/.erlang.cookie')
-          .and_return('ErLAnGCOookie')
-      end
-
-      it 'saves the on disk cookie to etcd' do
-        subject.start
-        expect(etcd.erlang_cookie).to eq 'ErLAnGCOookie'
-      end
-    end
-  end
-
-  describe '#synchronize' do
-    context 'etcd has more nodes than are running' do
-      before do
-        allow(client).to receive(:nodes)
-          .and_return([
-            {"name" => "rabbit@node1", "running" => true},
-            {"name" => "rabbit@node2", "running" => false}
-          ])
-        allow(subject).to receive(:system)
-        allow(client).to receive(:aliveness_test).and_return("status" => "ok")
-        allow(client).to receive(:overview).and_return("node" => "rabbit@this_node")
-      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(:system)
-          .with('rabbitmqctl forget_cluster_node rabbit@node2')
-        subject.synchronize
-      end
-
-
-      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@this_node", "running" => true}
-          ])
-        end
-
-        it 'will not remove any nodes' do
-          expect(subject).to_not receive(:system)
           subject.synchronize
+          expect(etcd.nodes).to include('rabbit@this_node')
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabbitmq-cluster
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -112,7 +112,8 @@ email:
 - ed.robinson@reevoo.com
 executables:
 - rabbitmq-cluster
-- rabbitmq-cluster-sidekick
+- rabbitmq-cluster-discovery
+- rabbitmq-cluster-prestart
 extensions: []
 extra_rdoc_files: []
 files:
@@ -122,7 +123,8 @@ files:
 - README.md
 - Rakefile
 - bin/rabbitmq-cluster
-- bin/rabbitmq-cluster-sidekick
+- bin/rabbitmq-cluster-discovery
+- bin/rabbitmq-cluster-prestart
 - lib/rabbitmq/cluster.rb
 - lib/rabbitmq/cluster/etcd.rb
 - lib/rabbitmq/cluster/server.rb
@@ -146,7 +148,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2679174376872424793
+      hash: -99154985774826741
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -155,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2679174376872424793
+      hash: -99154985774826741
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25