Merge pull request #291 from airbnb/ramya/ramya-config-changes

Add  MIN_JITTER and MAX_JITTER variables

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    synapse (0.16.8)
+    synapse (0.16.9)
       aws-sdk (~> 1.39)
       docker-api (~> 1.7)
       dogstatsd-ruby (~> 3.3.0)

lib/synapse/service_watcher/zookeeper.rb

@@ -6,6 +6,8 @@
 class Synapse::ServiceWatcher
   class ZookeeperWatcher < BaseWatcher
     NUMBERS_RE = /^\d+$/
+    MIN_JITTER = 0
+    MAX_JITTER = 120
 
     @@zk_pool = {}
     @@zk_pool_count = {}
@@ -286,7 +288,7 @@ def watcher_callback
         # This re-initializes callbacks just before get scan. So we do not miss any updates by sleeping.
         #
         if @watcher && @discovery['discovery_jitter']
-          if @discovery['discovery_jitter'] > 0 && @discovery['discovery_jitter'] < 120
+          if @discovery['discovery_jitter'].between?(MIN_JITTER, MAX_JITTER)
             log.info "synapse: sleeping for discovery_jitter=#{@discovery['discovery_jitter']} seconds for service:#{@name}"
             sleep @discovery['discovery_jitter']
           else

lib/synapse/version.rb

@@ -1,3 +1,3 @@
 module Synapse
-  VERSION = "0.16.8"
+  VERSION = "0.16.9"
 end

spec/lib/synapse/service_watcher_zookeeper_spec.rb

@@ -181,6 +181,15 @@
       subject.send(:watcher_callback).call
     end
 
+    it 'do not throttle on invalid discovery_jitter' do
+      discovery['discovery_jitter'] = Synapse::ServiceWatcher::ZookeeperWatcher::MAX_JITTER + 1
+      expect(subject).to receive(:watch)
+      expect(subject).to receive(:discover)
+      expect(subject).not_to receive(:sleep)
+      subject.instance_variable_set(:@watcher, instance_double(ZK::EventHandlerSubscription))
+      subject.send(:watcher_callback).call
+    end
+
     context "generator_config_path" do
       let(:discovery) { { 'method' => 'zookeeper', 'hosts' => 'somehost', 'path' => 'some/path', 'generator_config_path' => generator_config_path } }
       before :each do