big_brother 0.1.0 → 0.2.0

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3

data/README.md

@@ -1,5 +1,7 @@
 # BigBrother
 
+[![Build Status](https://secure.travis-ci.org/braintree/big_brother.png)](http://travis-ci.org/braintree/big_brother)
+
 TODO: Write a gem description
 
 ## Installation

data/lib/big_brother/cluster.rb

@@ -46,25 +46,20 @@ module BigBrother
     end
 
     def monitor_nodes
-      @nodes.each do |node|
-        BigBrother.ipvs.edit_node(@fwmark, node.address, _determine_weight(node))
-      end
-
+      @nodes.each { |node| node.monitor(self) }
       @last_check = Time.now
     end
 
-    def _determine_weight(node)
-      if @up_file.exists?
-        100
-      elsif @down_file.exists?
-        0
-      else
-        node.current_health
-      end
-    end
-
     def to_s
       "#{@name} (#{@fwmark})"
     end
+
+    def up_file_exists?
+      @up_file.exists?
+    end
+
+    def down_file_exists?
+      @down_file.exists?
+    end
   end
 end

data/lib/big_brother/configuration.rb

@@ -11,15 +11,19 @@ module BigBrother
     end
 
     def self.synchronize_with_ipvs(clusters, ipvs_state)
-      clusters.values.each do |cluster|
-        if ipvs_state.has_key?(cluster.fwmark.to_s)
-          cluster.resume_monitoring!
+      ipvs_state.each do |fwmark, running_nodes|
+        running_cluster = clusters.values.detect { |cluster| cluster.fwmark == fwmark.to_i }
 
-          running_nodes = ipvs_state[cluster.fwmark.to_s]
-          cluster_nodes = cluster.nodes.map(&:address)
+        if running_cluster.nil?
+          BigBrother.ipvs.stop_cluster(fwmark)
+        else
+          running_cluster.resume_monitoring!
 
-          _remove_nodes(cluster, running_nodes - cluster_nodes)
-          _add_nodes(cluster, cluster_nodes - running_nodes)
+          running_nodes = ipvs_state[running_cluster.fwmark.to_s]
+          cluster_nodes = running_cluster.nodes.map(&:address)
+
+          _remove_nodes(running_cluster, running_nodes - cluster_nodes)
+          _add_nodes(running_cluster, cluster_nodes - running_nodes)
         end
       end
     end

data/lib/big_brother/health_fetcher.rb

@@ -0,0 +1,13 @@
+module BigBrother
+  class HealthFetcher
+    def self.current_health(address, port, path)
+      http_response = EventMachine::HttpRequest.new("http://#{address}:#{port}#{path}").get
+
+      if http_response.response_header.has_key?('X_HEALTH')
+        http_response.response_header['X_HEALTH'].to_i
+      else
+        http_response.response.slice(/Health: (\d+)/, 1).to_i
+      end
+    end
+  end
+end

data/lib/big_brother/node.rb

@@ -8,22 +8,24 @@ module BigBrother
       @address = address
       @port = port
       @path = path
+      @weight = nil
     end
 
-    def current_health
-      response = _get("http://#{@address}:#{@port}#{@path}")
-      _parse_health(response)
-    end
-
-    def _get(url)
-      EventMachine::HttpRequest.new(url).get
+    def monitor(cluster)
+      new_weight = _determine_weight(cluster)
+      if new_weight != @weight
+        BigBrother.ipvs.edit_node(cluster.fwmark, address, _determine_weight(cluster))
+        @weight = new_weight
+      end
     end
 
-    def _parse_health(http_response)
-      if http_response.response_header.has_key?('X_HEALTH')
-        http_response.response_header['X_HEALTH'].to_i
+    def _determine_weight(cluster)
+      if cluster.up_file_exists?
+        100
+      elsif cluster.down_file_exists?
+        0
       else
-        http_response.response.slice(/Health: (\d+)/, 1).to_i
+        BigBrother::HealthFetcher.current_health(@address, @port, @path)
       end
     end
   end

data/lib/big_brother/version.rb

@@ -1,3 +1,3 @@
 module BigBrother
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/big_brother.rb

@@ -10,6 +10,7 @@ require 'sinatra/synchrony'
 require 'big_brother/app'
 require 'big_brother/cluster'
 require 'big_brother/configuration'
+require 'big_brother/health_fetcher'
 require 'big_brother/ipvs'
 require 'big_brother/logger'
 require 'big_brother/node'

data/spec/big_brother/cluster_spec.rb

@@ -48,38 +48,15 @@ describe BigBrother::Cluster do
       cluster.needs_check?.should be_false
     end
 
-    it "updates the weight for each node" do
-      node = Factory.node(:address => '127.0.0.1')
-      node.should_receive(:current_health).and_return(56)
-      cluster = Factory.cluster(:fwmark => 100, :nodes => [node])
+    it "calls monitor on each of the nodes" do
+      node1 = Factory.node
+      node2 = Factory.node
+      cluster = Factory.cluster(:nodes => [node1, node2])
 
-      cluster.monitor_nodes
-
-      @recording_executor.commands.should include("ipvsadm --edit-server --fwmark-service 100 --real-server 127.0.0.1 --ipip --weight 56")
-    end
-
-    it "sets the weight to 100 for each node if an upfile exists" do
-      node = Factory.node(:address => '127.0.0.1')
-      node.stub(:current_health).and_return(56)
-      cluster = Factory.cluster(:name => 'test', :fwmark => 100, :nodes => [node])
-
-      BigBrother::StatusFile.new('up', 'test').create('Up for testing')
-
-      cluster.monitor_nodes
-
-      @recording_executor.commands.should include("ipvsadm --edit-server --fwmark-service 100 --real-server 127.0.0.1 --ipip --weight 100")
-    end
-
-    it "sets the weight to 0 for each node if a downfile exists" do
-      node = Factory.node(:address => '127.0.0.1')
-      node.stub(:current_health).and_return(56)
-      cluster = Factory.cluster(:name => 'test', :fwmark => 100, :nodes => [node])
-
-      BigBrother::StatusFile.new('down', 'test').create('Down for testing')
+      node1.should_receive(:monitor).with(cluster)
+      node2.should_receive(:monitor).with(cluster)
 
       cluster.monitor_nodes
-
-      @recording_executor.commands.should include("ipvsadm --edit-server --fwmark-service 100 --real-server 127.0.0.1 --ipip --weight 0")
     end
   end
 
@@ -99,4 +76,26 @@ describe BigBrother::Cluster do
       cluster.to_s.should == "name (100)"
     end
   end
+
+  describe "#up_file_exists?" do
+    it "returns true when an up file exists" do
+      cluster = Factory.cluster(:name => 'name')
+      cluster.up_file_exists?.should be_false
+
+      BigBrother::StatusFile.new('up', 'name').create('Up for testing')
+
+      cluster.up_file_exists?.should be_true
+    end
+  end
+
+  describe "#down_file_exists?" do
+    it "returns true when an down file exists" do
+      cluster = Factory.cluster(:name => 'name')
+      cluster.down_file_exists?.should be_false
+
+      BigBrother::StatusFile.new('down', 'name').create('down for testing')
+
+      cluster.down_file_exists?.should be_true
+    end
+  end
 end

data/spec/big_brother/configuration_spec.rb

@@ -77,5 +77,14 @@ describe BigBrother::Configuration do
 
       @recording_executor.commands.should include("ipvsadm --add-server --fwmark-service 1 --real-server 127.0.1.1 --ipip --weight 100")
     end
+
+    it "will remove clusters that are no longer configured" do
+      clusters = { 'two' => Factory.cluster(:fwmark => 2) }
+      ipvs_state = { '1' => ['127.0.0.1'] }
+
+      BigBrother::Configuration.synchronize_with_ipvs(clusters, ipvs_state)
+
+      @recording_executor.commands.should include("ipvsadm --delete-service --fwmark-service 1")
+    end
   end
 end

data/spec/big_brother/health_fetcher_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+describe BigBrother::HealthFetcher do
+  describe "#current_health" do
+    run_in_reactor
+
+    it "returns its health" do
+      StubServer.new(<<-HTTP, 0.25)
+HTTP/1.0 200 OK
+Connection: close
+
+Health: 59
+HTTP
+      BigBrother::HealthFetcher.current_health("127.0.0.1", 8081, "/test/status").should == 59
+    end
+
+    it "returns 0 for an unknown service" do
+      StubServer.new(<<-HTTP, 0.25)
+HTTP/1.0 503 Service Unavailable
+Connection: close
+HTTP
+      BigBrother::HealthFetcher.current_health("127.0.0.1", 8081, "/test/status").should == 0
+    end
+
+    it "returns 0 for an unknown DNS entry" do
+      BigBrother::HealthFetcher.current_health("junk.local", 8081, "/test/status").should == 0
+    end
+
+    it "returns the health if it is passed in a header" do
+      StubServer.new(<<-HTTP, 0.25)
+HTTP/1.0 200 OK
+Connection: close
+X-Health: 61
+
+This part is for people.
+HTTP
+      BigBrother::HealthFetcher.current_health("127.0.0.1", 8081, "/test/status").should == 61
+    end
+  end
+
+end

data/spec/big_brother/node_spec.rb

@@ -1,44 +1,67 @@
 require 'spec_helper'
 
 describe BigBrother::Node do
-  describe "#current_health" do
-    run_in_reactor
-
-    it "returns its health" do
-      StubServer.new(<<-HTTP, 0.25)
-HTTP/1.0 200 OK
-Connection: close
-
-Health: 59
-HTTP
-      node = BigBrother::Node.new("127.0.0.1", 8081, "/test/status")
-      node.current_health.should == 59
+
+  describe "#monitor" do
+    it "updates the weight for the node" do
+      BigBrother::HealthFetcher.stub(:current_health).and_return(56)
+      node = Factory.node(:address => '127.0.0.1')
+      cluster = Factory.cluster(:fwmark => 100, :nodes => [node])
+
+      node.monitor(cluster)
+
+      @recording_executor.commands.should include("ipvsadm --edit-server --fwmark-service 100 --real-server 127.0.0.1 --ipip --weight 56")
+    end
+
+    it "sets the weight to 100 for each node if an up file exists" do
+      BigBrother::HealthFetcher.stub(:current_health).and_return(56)
+      node = Factory.node(:address => '127.0.0.1')
+      cluster = Factory.cluster(:fwmark => 100, :nodes => [node])
+
+      BigBrother::StatusFile.new('up', 'test').create('Up for testing')
+
+      node.monitor(cluster)
+
+      @recording_executor.commands.should include("ipvsadm --edit-server --fwmark-service 100 --real-server 127.0.0.1 --ipip --weight 100")
     end
 
-    it "returns 0 for an unknown service" do
-      StubServer.new(<<-HTTP, 0.25)
-HTTP/1.0 503 Service Unavailable
-Connection: close
-HTTP
-      node = BigBrother::Node.new("127.0.0.1", 8081, "/test/status")
-      node.current_health.should == 0
+    it "sets the weight to 0 for each node if a down file exists" do
+      BigBrother::HealthFetcher.stub(:current_health).and_return(56)
+      node = Factory.node(:address => '127.0.0.1')
+      cluster = Factory.cluster(:fwmark => 100, :nodes => [node])
+
+      BigBrother::StatusFile.new('down', 'test').create('Down for testing')
+
+      node.monitor(cluster)
+
+      @recording_executor.commands.should include("ipvsadm --edit-server --fwmark-service 100 --real-server 127.0.0.1 --ipip --weight 0")
     end
 
-    it "returns 0 for an unknown DNS entry" do
-      node = BigBrother::Node.new("junk.local", 8081, "/test/status")
-      node.current_health.should == 0
+    it "does not run multiple ipvsadm commands if the health does not change" do
+      BigBrother::HealthFetcher.stub(:current_health).and_return(56)
+      node = Factory.node(:address => '127.0.0.1')
+      cluster = Factory.cluster(:fwmark => 100, :nodes => [node])
+
+      node.monitor(cluster)
+      node.monitor(cluster)
+
+      @recording_executor.commands.should == ["ipvsadm --edit-server --fwmark-service 100 --real-server 127.0.0.1 --ipip --weight 56"]
     end
 
-    it "returns the health if it is passed in a header" do
-      StubServer.new(<<-HTTP, 0.25)
-HTTP/1.0 200 OK
-Connection: close
-X-Health: 61
+    it "will run multiple ipvsadm commands if the health does change" do
+      BigBrother::HealthFetcher.stub(:current_health).and_return(56)
+      node = Factory.node(:address => '127.0.0.1')
+      cluster = Factory.cluster(:fwmark => 100, :nodes => [node])
+
+      node.monitor(cluster)
+      node.monitor(cluster)
+      BigBrother::HealthFetcher.stub(:current_health).and_return(41)
+      node.monitor(cluster)
 
-This part is for people.
-HTTP
-      node = BigBrother::Node.new("127.0.0.1", 8081, "/test/status")
-      node.current_health.should == 61
+      @recording_executor.commands.should == [
+        "ipvsadm --edit-server --fwmark-service 100 --real-server 127.0.0.1 --ipip --weight 56",
+        "ipvsadm --edit-server --fwmark-service 100 --real-server 127.0.0.1 --ipip --weight 41"
+      ]
     end
   end
 end

data/spec/support/recording_executor.rb

@@ -7,5 +7,6 @@ class RecordingExecutor
 
   def invoke(command)
     @commands << command
+    ["", 0]
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: big_brother
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-15 00:00:00.000000000 Z
+date: 2012-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70321466649500 !ruby/object:Gem::Requirement
+  requirement: &70346477113640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *70321466649500
+  version_requirements: *70346477113640
 - !ruby/object:Gem::Dependency
   name: async-rack
-  requirement: &70321466648640 !ruby/object:Gem::Requirement
+  requirement: &70346477113100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.5.1
   type: :runtime
   prerelease: false
-  version_requirements: *70321466648640
+  version_requirements: *70346477113100
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70321466648140 !ruby/object:Gem::Requirement
+  requirement: &70346477112480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70321466648140
+  version_requirements: *70346477112480
 - !ruby/object:Gem::Dependency
   name: rack-fiber_pool
-  requirement: &70321466647520 !ruby/object:Gem::Requirement
+  requirement: &70346477111740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70321466647520
+  version_requirements: *70346477111740
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70321466646780 !ruby/object:Gem::Requirement
+  requirement: &70346477111000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -68,10 +68,10 @@ dependencies:
         version: 1.0.0.beta.100
   type: :runtime
   prerelease: false
-  version_requirements: *70321466646780
+  version_requirements: *70346477111000
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70321466645620 !ruby/object:Gem::Requirement
+  requirement: &70346477109640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -79,10 +79,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70321466645620
+  version_requirements: *70346477109640
 - !ruby/object:Gem::Dependency
   name: em-synchrony
-  requirement: &70321466644700 !ruby/object:Gem::Requirement
+  requirement: &70346477108780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -90,10 +90,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70321466644700
+  version_requirements: *70346477108780
 - !ruby/object:Gem::Dependency
   name: em-resolv-replace
-  requirement: &70321466643840 !ruby/object:Gem::Requirement
+  requirement: &70346477107660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -101,10 +101,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70321466643840
+  version_requirements: *70346477107660
 - !ruby/object:Gem::Dependency
   name: em-syslog
-  requirement: &70321466642720 !ruby/object:Gem::Requirement
+  requirement: &70346477106820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -112,10 +112,10 @@ dependencies:
         version: 0.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70321466642720
+  version_requirements: *70346477106820
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70321466641880 !ruby/object:Gem::Requirement
+  requirement: &70346477106340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -123,10 +123,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70321466641880
+  version_requirements: *70346477106340
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70321466641380 !ruby/object:Gem::Requirement
+  requirement: &70346477105760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -134,10 +134,10 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *70321466641380
+  version_requirements: *70346477105760
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70321466640920 !ruby/object:Gem::Requirement
+  requirement: &70346477105080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -145,10 +145,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70321466640920
+  version_requirements: *70346477105080
 - !ruby/object:Gem::Dependency
   name: rake_commit
-  requirement: &70321466640060 !ruby/object:Gem::Requirement
+  requirement: &70346477104300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -156,10 +156,10 @@ dependencies:
         version: '0.13'
   type: :development
   prerelease: false
-  version_requirements: *70321466640060
+  version_requirements: *70346477104300
 - !ruby/object:Gem::Dependency
   name: vagrant
-  requirement: &70321466639400 !ruby/object:Gem::Requirement
+  requirement: &70346477103860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -167,7 +167,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70321466639400
+  version_requirements: *70346477103860
 description: IPVS backend supervisor
 email:
 - code@getbraintree.com
@@ -180,6 +180,7 @@ files:
 - .gitignore
 - .rake_commit
 - .rvmrc
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -193,6 +194,7 @@ files:
 - lib/big_brother/cli.rb
 - lib/big_brother/cluster.rb
 - lib/big_brother/configuration.rb
+- lib/big_brother/health_fetcher.rb
 - lib/big_brother/ipvs.rb
 - lib/big_brother/logger.rb
 - lib/big_brother/node.rb
@@ -207,6 +209,7 @@ files:
 - spec/big_brother/app_spec.rb
 - spec/big_brother/cluster_spec.rb
 - spec/big_brother/configuration_spec.rb
+- spec/big_brother/health_fetcher_spec.rb
 - spec/big_brother/ipvs_spec.rb
 - spec/big_brother/node_spec.rb
 - spec/big_brother/shell_executor_spec.rb
@@ -252,6 +255,7 @@ test_files:
 - spec/big_brother/app_spec.rb
 - spec/big_brother/cluster_spec.rb
 - spec/big_brother/configuration_spec.rb
+- spec/big_brother/health_fetcher_spec.rb
 - spec/big_brother/ipvs_spec.rb
 - spec/big_brother/node_spec.rb
 - spec/big_brother/shell_executor_spec.rb