haproxy-cluster 0.0.4 → 0.0.5

data/README.md

@@ -15,7 +15,7 @@ While there are already a handfull of [HA Proxy](http://haproxy.1wt.edu) abstrac
 
 `haproxy_cluster` provides a shell scripting interface for `HAProxyCluster`. Exit codes are meaningful and intended to be useful from Nagios.
 
-Do you deploy new code using a sequential restart of application servers? Using this common pattern carelessly can result in too many servers being down at the same time, and cutomers seeing errors. `haproxy_cluster` can prevent this by ensuring that every load balancer agrees that the application is up at each stage in the deployment. In the example below, we will deploy a new WAR to three Tomcat instances which are fronted by two HA Proxy instances. HA Proxy has been configured with `option httpchk /check`, a path which only returns an affirmative status code when the application is ready to serve requests.
+Do you deploy new code using a sequential restart of application servers? Using this common pattern carelessly can result in too many servers being down at the same time, and cutomers seeing errors. `haproxy_cluster` can prevent this by ensuring that every load balancer agrees that all (or enough) servers are up at each stage in the deployment. In the example below, we will deploy a new WAR to three Tomcat instances which are fronted by two HA Proxy instances. HA Proxy has been configured with `option httpchk /check`, a path which only returns an affirmative status code when the application is ready to serve requests.
 
 ```bash
 #!bin/bash
@@ -24,29 +24,31 @@ servers="server1.example.com server2.example.com server3.example.com"
 load_balancers="https://lb1.example.com:8888 http://lb2.example.com:8888"
 
 for server in $servers ; do
-    haproxy_cluster --timeout=300 --eval "wait_until(true){ myapp.rolling_restartable? }" $load_balancers
+    haproxy_cluster --eval "wait_until(:condition => true){ myapp.rolling_restartable? }" $load_balancers
     scp myapp.war $server:/opt/tomcat/webapps
 done
 ```
 
-The code block passed to `--eval` will not return until every load balancer reports that at least 80% of the backend servers defined for "myapp" are ready to serve requests. If this takes more than 5 minutes (300 seconds), the whole deployment is halted.
+The code block passed to `--eval` will not return until every load balancer reports that at least 80% of the backend servers defined for "myapp" are ready to serve requests (or all of them are down). This condition must pass 3 times in a row for it to be considered valid. If this takes more than 5 minutes (300 seconds), the whole deployment is halted.
 
 Maybe you'd like to know how many transactions per second your whole cluster is processing.
 
-    $ haproxy_cluster --eval 'poll{ puts members.map{|m|m.myapp.rate}.inject(:+) }' $load_balancers
+```bash
+haproxy_cluster --eval 'poll{ puts members.map{|m|m.myapp.rate}.inject(:+) }' $load_balancers
+```
 
 Installation
 ------------
 
 `gem install haproxy-cluster`
 
-Requires Ruby 1.9.2 and depends on RestClient.
+Requires Ruby 1.9.3 and depends on RestClient.
 
 Non-Features
 ------------
 
 * Doesn't try to modify configuration files. Use [haproxy-tools](https://github.com/subakva/haproxy-tools), [rhaproxy](https://github.com/jjuliano/rhaproxy), [haproxy_join](https://github.com/joewilliams/haproxy_join), or better yet, [Chef](http://www.opscode.com/chef) for that.
-* Doesn't talk to sockets, yet. Use [haproxy-ruby](https://github.com/inkel/haproxy-ruby) for now if you need this. I intend to add support for this using `Net::SSH` and `socat(1)` but for now HTTP is enough for my needs.
+* Doesn't talk to sockets, yet. Use [haproxy-ruby](https://github.com/inkel/haproxy-ruby) for now if you need this. I intend to add support for this using `Net::SSH` and `socat(1)` but for now HTTP is enough for my needs. Please comment on Issue \#6 if you care about this feature.
 
 ProTip
 ------
@@ -56,3 +58,7 @@ HA Proxy's awesome creator Willy Tarrreau loves [big text files](http://haproxy.
 * http://code.google.com/p/haproxy-docs/
 * http://cbonte.github.com/haproxy-dconv/configuration-1.5.html
 
+
+<hr/>
+[![Build Status](https://secure.travis-ci.org/jelder/haproxy_cluster.png)](http://travis-ci.org/jelder/haproxy_cluster)
+

data/lib/haproxy_cluster.rb

@@ -1,7 +1,12 @@
 require 'haproxy_cluster/member'
+require 'timeout'
 require 'thread'
 
 class HAProxyCluster
+
+  Inf = +1.0/0.0
+  NegInf = -1.0/0.0
+
   def initialize(members = [])
     @members = []
     threads = []
@@ -21,51 +26,59 @@ class HAProxyCluster
     first = true
     loop do
       start = Time.now
-      map { poll! } unless first
+      each_member { poll! } unless first
       first = false
       yield
       sleep interval - (Time.now - start)
     end
   end
 
-  # Poll the entire cluster using exponential backoff until the the given
-  # block's return value always matches the condition (expressed as boolean or
-  # range).
+  # Poll the entire cluster until the the given block's return value always
+  # matches the condition (expressed as boolean or range).
   #
-  # A common form of this is:
+  # This block would not return until every member of the cluster is available
+  # to serve requests.
   #
-  #   wait_for(true) do
+  #   wait_for(:condition => true) do
   #     api.servers.map{|s|s.ok?}
   #   end
   #
-  # This block would not return until every member of the cluster is available
-  # to serve requests.
-  # 
-  # wait_until(1!=1){false} #=> true
-  # wait_until(1==1){true}  #=> true
-  # wait_until(1..3){2}     #=> true
-  # wait_until(true){sleep} #=> Timeout
-  def wait_until (condition, &code)
-    results = map(&code)
-    delay = 1.5
-    loop do
-      if reduce(condition, results.values.flatten)
-        return true
-      end
-      if delay > 60
-        puts "Too many timeouts, giving up"
-        return false
+  # The constants `Inf` and `NegInf` (representing infinity and negative
+  # infinity respectively) are available, which enables less than/greater than
+  # expressions in the form of `Range`s.
+  #
+  # Parameters:
+  #
+  # * :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
+  #
+  def wait_until (options = {}, &code)
+    opts = {
+      :condition => true,
+      :interval => 2.0,
+      :timeout => 300,
+      :min_checks => 3
+    }.merge options
+    Timeout::timeout(opts[:timeout]) do
+      history = []
+      loop do
+        results = each_member(&code)
+
+        # Break out as soon as we reach :min_checks in a row
+        history << check_condition(opts[:condition], results.values.flatten)
+        return true if history.last(opts[:min_checks]) == [true] * opts[:min_checks]
+
+        sleep opts[:interval]
+        each_member { poll! }
       end
-      delay *= 2
-      sleep delay
-      map { poll! }
-      results = map(&code)
     end
   end
 
   # Run the specified code against every memeber of the cluster. Results are
   # returned as a Hash, with member.to_s being the key.
-  def map (&code)
+  def each_member (&code)
     threads = []
     results = {}
     @members.each do |member|
@@ -80,7 +93,12 @@ class HAProxyCluster
   # Return true or false depending on the relationship between `condition` and `values`.
   # `condition` may be specified as true, false, or a Range object.
   # `values` is an Array of whatever type is appropriate for the condition.
-  def reduce (condition, values)
+  #
+  #   check_condition(0!=1,   [true])         #=> true
+  #   check_condition(1==1,   [true])         #=> true
+  #   check_condition(3..Inf, [2,2])          #=> false
+  #   check_condition(true,   [true,false])   #=> raise Timeout::timeout
+  def check_condition (condition, values)
     case condition.class.to_s
     when "Range"
       values.each{ |v| return false unless condition.cover? v }

data/lib/haproxy_cluster/cli.rb

@@ -44,7 +44,7 @@ if options.code_string
 
   case result.class.to_s
   when "TrueClass","FalseClass"
-    exit result == true ? 0 : 1
+    exit result == true ? 0 : 2
   when "Hash"
     pp result
   when "Array"

data/lib/haproxy_cluster/member.rb

@@ -20,13 +20,13 @@ class HAProxyCluster
     end
 
     def poll!
-      case @type
+      csv = case @type
       when :url
-        csv = RestClient.get(@source + ';csv').gsub(/^# /,'').gsub(/,$/,'')
+        RestClient.get(@source + ';csv')
       when :file
         File.read(@source)
       end
-      CSV.parse(csv, { :headers => :first_row, :converters => :all, :header_converters => [:downcase,:symbol] } ) do |row|
+      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 

data/lib/haproxy_cluster/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haproxy-cluster
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-24 00:00:00.000000000 Z
+date: 2012-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70257308044560 !ruby/object:Gem::Requirement
+  requirement: &70230919355820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,8 +21,30 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70257308044560
-description: ! "  Ruby Gem and command line tool for quickly answering questions like,
+  version_requirements: *70230919355820
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: &70230919354840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70230919354840
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: &70230919353540 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70230919353540
+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
   deployment\n  and monitoring solutions.\n"
@@ -66,6 +88,6 @@ rubyforge_project:
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: Inspect and manipulate collections of HA Proxy instances
+summary: A DSL for inspecting and manipulating groups of HA Proxy instances.
 test_files: []
 has_rdoc: