synapse 0.10.0 → 0.11.0

data/README.md

@@ -1,5 +1,5 @@
 [![Build Status](https://travis-ci.org/airbnb/synapse.png?branch=master)](https://travis-ci.org/airbnb/synapse)
-[![Inline docs](http://inch-pages.github.io/github/airbnb/synapse.png)](http://inch-pages.github.io/github/airbnb/synapse)
+[![Inline docs](http://inch-ci.org/github/airbnb/synapse.png)](http://inch-ci.org/github/airbnb/synapse)
 
 # Synapse #
 

data/lib/synapse.rb

@@ -23,6 +23,12 @@ module Synapse
 
       # configuration is initially enabled to configure on first loop
       @config_updated = true
+
+      # Any exceptions in the watcher threads should wake the main thread so
+      # that we can fail fast.
+      Thread.abort_on_exception = true
+
+      log.debug "synapse: completed init"
     end
 
     # start all the watchers and enable haproxy configuration

data/lib/synapse/haproxy.rb

@@ -70,6 +70,7 @@ module Synapse
         "option splice-response",
         "option srvtcpka",
         "option ssl-hello-chk",
+        "option tcp-check",
         "option tcp-smart-connect",
         "option tcpka",
         "option tcplog",
@@ -121,6 +122,10 @@ module Synapse
         "stick store-request",
         "stick store-response",
         "stick-table",
+        "tcp-check connect",
+        "tcp-check expect",
+        "tcp-check send",
+        "tcp-check send-binary",
         "tcp-request content",
         "tcp-request inspect-delay",
         "tcp-response content",
@@ -203,6 +208,7 @@ module Synapse
         "option splice-response",
         "option srvtcpka",
         "option ssl-hello-chk",
+        "option tcp-check",
         "option tcp-smart-accept",
         "option tcp-smart-connect",
         "option tcpka",
@@ -415,6 +421,7 @@ module Synapse
         "option splice-response",
         "option srvtcpka",
         "option ssl-hello-chk",
+        "option tcp-check",
         "option tcp-smart-accept",
         "option tcp-smart-connect",
         "option tcpka",
@@ -468,6 +475,10 @@ module Synapse
         "stick store-request",
         "stick store-response",
         "stick-table",
+        "tcp-check connect",
+        "tcp-check expect",
+        "tcp-check send",
+        "tcp-check send-binary",
         "tcp-request connection",
         "tcp-request content",
         "tcp-request inspect-delay",

data/lib/synapse/service_watcher/zookeeper.rb

@@ -7,31 +7,26 @@ module Synapse
     NUMBERS_RE = /^\d+$/
 
     def start
-      zk_hosts = @discovery['hosts'].shuffle.join(',')
+      @zk_hosts = @discovery['hosts'].shuffle.join(',')
 
-      log.info "synapse: starting ZK watcher #{@name} @ hosts: #{zk_hosts}, path: #{@discovery['path']}"
-      @should_exit = false
-      @zk = ZK.new(zk_hosts)
+      @watcher = nil
+      @zk = nil
 
-      # call the callback to bootstrap the process
-      watcher_callback.call
+      log.info "synapse: starting ZK watcher #{@name} @ hosts: #{@zk_hosts}, path: #{@discovery['path']}"
+      zk_connect
     end
 
     def stop
       log.warn "synapse: zookeeper watcher exiting"
-
-      @should_exit = true
-      @watcher.unsubscribe if defined? @watcher
-      @zk.close! if defined? @zk
-
-      log.info "synapse: zookeeper watcher cleaned up successfully"
+      zk_cleanup
     end
 
     def ping?
-      @zk.ping?
+      @zk && @zk.connected?
     end
 
     private
+
     def validate_discovery_opts
       raise ArgumentError, "invalid discovery method #{@discovery['method']}" \
         unless @discovery['method'] == 'zookeeper'
@@ -44,6 +39,7 @@ module Synapse
     # helper method that ensures that the discovery path exists
     def create(path)
       log.debug "synapse: creating ZK path: #{path}"
+
       # recurse if the parent node does not exist
       create File.dirname(path) unless @zk.exists? File.dirname(path)
       @zk.create(path, ignore: :node_exists)
@@ -54,29 +50,23 @@ module Synapse
       log.info "synapse: discovering backends for service #{@name}"
 
       new_backends = []
-      begin
-        @zk.children(@discovery['path'], :watch => true).each do |id|
-          node = @zk.get("#{@discovery['path']}/#{id}")
-
-          begin
-            host, port, name = deserialize_service_instance(node.first)
-          rescue StandardError => e
-            log.error "synapse: invalid data in ZK node #{id} at #{@discovery['path']}: #{e}"
-          else
-            server_port = @server_port_override ? @server_port_override : port
-
-            # find the numberic id in the node name; used for leader elections if enabled
-            numeric_id = id.split('_').last
-            numeric_id = NUMBERS_RE =~ numeric_id ? numeric_id.to_i : nil
-
-            log.debug "synapse: discovered backend #{name} at #{host}:#{server_port} for service #{@name}"
-            new_backends << { 'name' => name, 'host' => host, 'port' => server_port, 'id' => numeric_id}
-          end
+      @zk.children(@discovery['path'], :watch => true).each do |id|
+        node = @zk.get("#{@discovery['path']}/#{id}")
+
+        begin
+          host, port, name = deserialize_service_instance(node.first)
+        rescue StandardError => e
+          log.error "synapse: invalid data in ZK node #{id} at #{@discovery['path']}: #{e}"
+        else
+          server_port = @server_port_override ? @server_port_override : port
+
+          # find the numberic id in the node name; used for leader elections if enabled
+          numeric_id = id.split('_').last
+          numeric_id = NUMBERS_RE =~ numeric_id ? numeric_id.to_i : nil
+
+          log.debug "synapse: discovered backend #{name} at #{host}:#{server_port} for service #{@name}"
+          new_backends << { 'name' => name, 'host' => host, 'port' => server_port, 'id' => numeric_id}
         end
-      rescue ZK::Exceptions::NoNode
-        # the path must exist, otherwise watch callbacks will not work
-        create(@discovery['path'])
-        retry
       end
 
       if new_backends.empty?
@@ -94,10 +84,16 @@ module Synapse
 
     # sets up zookeeper callbacks if the data at the discovery path changes
     def watch
-      return if @should_exit
+      return if @zk.nil?
 
-      @watcher.unsubscribe if defined? @watcher
+      @watcher.unsubscribe unless @watcher.nil?
       @watcher = @zk.register(@discovery['path'], &watcher_callback)
+
+      # Verify that we actually set up the watcher.
+      unless @zk.exists?(@discovery['path'], :watch => true)
+        log.error "synapse: zookeeper watcher path #{@discovery['path']} does not exist!"
+        raise RuntimeError.new('could not set a ZK watch on a node that should exist')
+      end
     end
 
     # handles the event that a watched path has changed in zookeeper
@@ -112,6 +108,36 @@ module Synapse
       end
     end
 
+    def zk_cleanup
+      log.info "synapse: zookeeper watcher cleaning up"
+
+      @watcher.unsubscribe unless @watcher.nil?
+      @watcher = nil
+
+      @zk.close! unless @zk.nil?
+      @zk = nil
+
+      log.info "synapse: zookeeper watcher cleaned up successfully"
+    end
+
+    def zk_connect
+      log.info "synapse: zookeeper watcher connecting to ZK at #{@zk_hosts}"
+      @zk = ZK.new(@zk_hosts)
+
+      # handle session expiry -- by cleaning up zk, this will make `ping?`
+      # fail and so synapse will exit
+      @zk.on_expired_session do
+        log.warn "synapse: zookeeper watcher ZK session expired!"
+        zk_cleanup
+      end
+
+      # the path must exist, otherwise watch callbacks will not work
+      create(@discovery['path'])
+
+      # call the callback to bootstrap the process
+      watcher_callback.call
+    end
+
     # decode the data at a zookeeper endpoint
     def deserialize_service_instance(data)
       log.debug "synapse: deserializing process data"

data/lib/synapse/version.rb

@@ -1,3 +1,3 @@
 module Synapse
-  VERSION = "0.10.0"
+  VERSION = "0.11.0"
 end

data/synapse.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
 
-  gem.add_runtime_dependency "zk", "~> 1.9.2"
+  gem.add_runtime_dependency "zk", "~> 1.9.4"
   gem.add_runtime_dependency "docker-api", "~> 1.7.2"
 
   gem.add_development_dependency "rake"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: synapse
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-07 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zk
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.9.2
+        version: 1.9.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.9.2
+        version: 1.9.4
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
@@ -162,18 +162,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2945433216079037469
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2945433216079037469
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23