haproxy-cluster 0.0.5 → 0.0.6

data/README.md

@@ -37,6 +37,13 @@ Maybe you'd like to know how many transactions per second your whole cluster is
 haproxy_cluster --eval 'poll{ puts members.map{|m|m.myapp.rate}.inject(:+) }' $load_balancers
 ```
 
+Perhaps there's a particular server which needs to be removed from the cluster quickly and temporarily.
+
+```bash
+haproxy_cluster --eval 'each_member{ myapp.servers.find("server3").disable! }' $load_balancers
+```
+
+
 Installation
 ------------
 

data/lib/haproxy_cluster.rb

@@ -29,7 +29,12 @@ class HAProxyCluster
       each_member { poll! } unless first
       first = false
       yield
-      sleep interval - (Time.now - start)
+      delay = Time.now - start
+      if delay >= interval
+        sleep interval
+      else
+        sleep interval - delay
+      end
     end
   end
 
@@ -52,7 +57,7 @@ class HAProxyCluster
   # * :condition, anything accepted by `check_condition`
   # * :interval, check interval (default 2 seconds, same as HA Proxy) 
   # * :timeout, give up after this number of seconds 
-  # * :min_checks, require :condtion to pass this many times in a row
+  # * :min_checks, require :condition to pass this many times in a row
   #
   def wait_until (options = {}, &code)
     opts = {

data/lib/haproxy_cluster/backend.rb

@@ -1,29 +1,34 @@
 require 'haproxy_cluster/stats_container'
-require 'haproxy_cluster/server_collection'
 
 class HAProxyCluster
 
   class Backend < StatsContainer
+    TYPE_ID = 1
 
-    def initialize
-      @servers = ServerCollection.new
-      super
+    def initialize(stats,member = nil)
+      @member = member
+      @servers = Hash.new { |h,k| h[k] = Server.new({},@member) }
+      super stats
     end
 
     attr_accessor :servers
+    attr_reader :member
 
     def name
       self.pxname
     end
 
     def rolling_restartable? (enough = 80)
-      up_servers = @servers.map{ |s| s.ok? }.count
+      up_servers = @servers.map{ |name,server| s.ok? }.count
       if up_servers == 0
-        return true    # All servers are down; can't hurt!
+        @member.log.warn { "All servers are down; can't hurt!" }
+        return true
       elsif Rational(up_servers,@servers.count) >= Rational(enough,100)
-        return true    # Minumum % is satisfied
+        @member.log.info { "#{up_servers}/#{@servers.count} is at least #{enough}%!" }
+        return true
       else
-        return false   # Not enough servers are up to handle restarting #{number_to_restart} at a time.
+        @member.log.warn { "Insufficient capacity to handle a rolling restart at this time." }
+        return false
       end
     end
 

data/lib/haproxy_cluster/cli.rb

@@ -7,6 +7,8 @@ require 'timeout'
 require 'haproxy_cluster/version'
 require 'haproxy_cluster'
 
+Signal.trap("INT"){exit 1}
+
 options = OpenStruct.new
 OptionParser.new do |opts|
   opts.banner = "Usage: #{File.basename $0} ARGS URL [URL] [...]"
@@ -31,7 +33,6 @@ OptionParser.new do |opts|
 end.parse!
 options.urls = ARGV
 
-
 if options.code_string
 
   if options.timeout

data/lib/haproxy_cluster/member.rb

@@ -1,24 +1,33 @@
 require 'csv'
+require 'logger'
 require 'rest-client'
 require 'haproxy_cluster/backend'
 require 'haproxy_cluster/server'
 
 class HAProxyCluster
   class Member
-    BACKEND = 1
-    SERVER  = 2
 
     def initialize(source)
       @source = source
-      @backends = Hash.new { |h,k| h[k] = Backend.new }
+      @log = Logger.new(STDOUT)
+      original_formatter = Logger::Formatter.new
+      @log.formatter = proc { |severity,datetime,progname,msg|
+        original_formatter.call(severity,datetime,"HAProxyCluster",msg)
+      }
+      @backends = Hash.new { |h,k| h[k] = Backend.new({},self) }
       if source =~ /https?:/
         @type = :url
+        @name = URI.parse(@source).host
       else
         @type = :file
+        @name = @source
       end
       poll!
     end
 
+    attr_accessor :backends, :source, :type, :name, :log
+    def to_s; @name; end
+
     def poll!
       csv = case @type
       when :url
@@ -28,19 +37,14 @@ class HAProxyCluster
       end
       CSV.parse(csv.gsub(/^# /,'').gsub(/,$/,''), { :headers => :first_row, :converters => :all, :header_converters => [:downcase,:symbol] } ) do |row|
         case row[:type]
-        when BACKEND
-          @backends[ row[:pxname].to_sym ].stats.merge! row.to_hash 
-        when SERVER
-          @backends[ row[:pxname].to_sym ].servers << Server.new(row.to_hash, self)
+        when Backend::TYPE_ID
+          @backends[ row[:pxname].to_sym ].stats = row.to_hash 
+        when Server::TYPE_ID
+          @backends[ row[:pxname].to_sym ].servers[ row[:svname] ].stats = row.to_hash
         end
       end
     end
 
-    attr_accessor :backends, :source, :type
-
-    def get_binding; binding; end
-    def to_s; @source; end
-
     # Allow Backends to be accessed by dot-notation
     def method_missing(m, *args, &block)
       if @backends.has_key? m

data/lib/haproxy_cluster/server.rb

@@ -3,11 +3,13 @@ require 'haproxy_cluster/stats_container'
 class HAProxyCluster
 
   class Server < StatsContainer
+    TYPE_ID = 2
 
-    def initialize (stats,member)
+    def initialize(stats,member = nil)
       @member = member
       super stats
     end
+    attr_reader :member
 
     def name
       self.svname 

data/lib/haproxy_cluster/stats_container.rb

@@ -7,10 +7,27 @@ class HAProxyCluster
 
     def initialize(stats = {})
       @stats = stats
+      @monitor_fields = [:status]
     end
 
     attr_accessor :stats
 
+    def monitor(field)
+      @monitor_fields << field.to_sym
+    end
+
+    def stats=(new)
+      old = @stats
+      @stats = new
+      @monitor_fields.each do |field|
+        if new.has_key? field and not old.has_key? field
+          @member.log.info { "#{self.member.name} believes #{name} #{field} is #{new[field]}" }
+        elsif old[field] != new[field]
+          @member.log.info { "#{self.member.name} noticed a #{field} transition on #{name}: #{old[field]} -> #{new[field]}" }
+        end
+      end
+    end
+
     def method_missing(m, *args, &block)
       if @stats.has_key? m
         @stats[m]

data/lib/haproxy_cluster/version.rb

@@ -1,3 +1,3 @@
 class HAProxyCluster
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haproxy-cluster
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-31 00:00:00.000000000 Z
+date: 2012-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70230919355820 !ruby/object:Gem::Requirement
+  requirement: &70259727274420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70230919355820
+  version_requirements: *70259727274420
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &70230919354840 !ruby/object:Gem::Requirement
+  requirement: &70259727299520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70230919354840
+  version_requirements: *70259727299520
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70230919353540 !ruby/object:Gem::Requirement
+  requirement: &70259727295540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70230919353540
+  version_requirements: *70259727295540
 description: ! "  Gem and command line tool for quickly answering questions like,
   \"Can we\n  survive a rolling restart?\", \"How many transactions per second am
   I seeing?\",\n  \"What's my session backlog?\". Intended for use within continuous
@@ -61,7 +61,6 @@ files:
 - lib/haproxy_cluster/cli.rb
 - lib/haproxy_cluster/member.rb
 - lib/haproxy_cluster/server.rb
-- lib/haproxy_cluster/server_collection.rb
 - lib/haproxy_cluster/stats_container.rb
 - lib/haproxy_cluster/version.rb
 - lib/haproxy_cluster.rb

data/lib/haproxy_cluster/server_collection.rb

@@ -1,9 +0,0 @@
-class HAProxyCluster
-  class ServerCollection < Array
-    def find(string)
-      self.select do |s|
-        s.name == string
-      end.first
-    end
-  end
-end