etcenv 0.5.4 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a34bc3d33dbd8d1c025fe6ff53a5272ea9d9f91e
-  data.tar.gz: 301aa17b8229307c74326d18d025a7663c200735
+  metadata.gz: 71bb85e40d0ef6634a604310ebe76b3a7707244e
+  data.tar.gz: 4bfeab28a6562cc8fb7e259cafccc92396a3d198
 SHA512:
-  metadata.gz: 5603e6e5b8ed263db00bef09ff903186b01a551a3550e0def6ff352a30d16354169f78be0bc802b2b51b1a791d6f284c06edb72bb95ef3555779cb62f8512bd0
-  data.tar.gz: fb36bb81a2651e41cbb787d635d23ead2138a5f42f05bfc23bb415f9fb70db3a33ad33a75dba30f230bf4eac14fa416bb884cfc1b228acd7747f9de790bf93d3
+  metadata.gz: 5837fa617120b09edf6fa744bf93d48e499bd4fd90aa4537a761c409ded2c804a4bb7142fe00ef495c59a2bd11d5814c7e54fad61994e3f083f5e51a20689841
+  data.tar.gz: 6968faa4d765dca8c58097adfdbf1d395133018f0075e22e4f9d898b1c8de8ca06ea2a69355e79f683c3076b0b3b6ab29e8df60db09164e107dfb43a0fa008ee

data/lib/etcenv/environment.rb

@@ -21,7 +21,7 @@ module Etcenv
       load
     end
     
-    attr_reader :root_key, :env, :etcd
+    attr_reader :root_key, :env, :etcd, :cluster_index
     attr_accessor :max_depth
 
     def expanded_env
@@ -32,6 +32,10 @@ module Etcenv
       @modified_indices ||= {}
     end
 
+    def keys
+      modified_indices.keys
+    end
+
     def load
       @lock.synchronize do
         flush
@@ -52,6 +56,7 @@ module Etcenv
       @includes = nil
       @cache = {}
       @modified_indices = {}
+      @cluster_index = nil
       self
     end
 
@@ -79,7 +84,9 @@ module Etcenv
       key = resolve_key(name)
       return cache[key] if cache[key]
 
-      node = @etcd.get(key).node
+      resp = @etcd.get(key)
+      node = resp.node
+      @cluster_index = [@cluster_index, resp.etcd_index].compact.min
 
       if node.etcvault_error
         raise EtcvaultFailure, node.etcvault_error

data/lib/etcenv/version.rb

@@ -1,3 +1,3 @@
 module Etcenv
-  VERSION = "0.5.4"
+  VERSION = "0.6.0"
 end

data/lib/etcenv/watcher.rb

@@ -19,8 +19,8 @@ module Etcenv
 
     def watch
       ch = Queue.new
-      threads = env.modified_indices.map do |key, index|
-        Thread.new(ch, key, index, &method(:watch_thread)).tap do |th|
+      threads = env.keys.map do |key|
+        Thread.new(ch, key, env.cluster_index, &method(:watch_thread)).tap do |th|
           th.abort_on_exception = true
         end
       end
@@ -30,6 +30,7 @@ module Etcenv
     end
 
     def auto_reload_loop
+      retries = 0
       loop do
         begin
           watch
@@ -37,8 +38,15 @@ module Etcenv
           env.load
           yield env if block_given?
         rescue => e
+          retries += 1
+          interval = (2**retries) * 0.1
+
           $stderr.puts "[watcher][error] Failed to reload env #{env.root_key}: #{e.inspect}"
           $stderr.puts "\t#{e.backtrace.join("\n\t")}"
+          $stderr.puts "[watcher][error] RETRYING reload #{env.root_key} in #{'%.2f' % interval} sec"
+          sleep interval
+        else
+          retries = 0
         end
       end
     end
@@ -46,8 +54,24 @@ module Etcenv
     private
 
     def watch_thread(ch, key, index)
+      tries = 0
+      loop do
+        if try_watch(key, index)
+          ch << key
+          break
+        end
+        interval = (2 ** tries) * 0.1
+        $stderr.puts "[watcher] RETRYING; #{key.inspect} watch will resume after #{'%.2f' % interval} sec"
+        sleep interval
+        tries += 1
+      end
+    end
+
+    def try_watch(key, index)
       $stderr.puts "[watcher] waiting for change on #{key} (index: #{index.succ})" if verbose
-      response = etcd.watch(key, recursive: true, index: [@indices[key] || 0, index].max.succ, timeout: WATCH_TIMEOUT)
+      index = [@indices[key], index].compact.max
+      index += 1 if index
+      response = etcd.watch(key, recursive: true, index: index, timeout: WATCH_TIMEOUT)
       @lock.synchronize do
         # Record modified_index in watcher itself; Because the latest index may be hidden in normal response
         # e.g. unlisted keys, removed keys
@@ -55,8 +79,17 @@ module Etcenv
       end
       $stderr.puts "[watcher] dir #{key} has updated" if verbose
       ch << key
+      return true
+    rescue Etcd::EventIndexCleared => e
+      $stderr.puts "[watcher][warn] #{e.inspect} on key #{key.inspect}, trying to get X-Etcd-Index" if verbose
+      @lock.synchronize do
+        @indices[key] = etcd.get(key).etcd_index
+      end
+      $stderr.puts "[watcher][warn] Updated #{key.inspect} index to #{@indices[key]}" if verbose
+      return nil
     rescue Net::ReadTimeout
-      retry
+      $stderr.puts "[watcher] #{e.inspect} on key #{key.inspect}" if verbose
+      return nil
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etcenv
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.6.0
 platform: ruby
 authors:
 - Shota Fukumori (sora_h)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-04 00:00:00.000000000 Z
+date: 2016-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: Dump etcd keys into dotenv file or docker env file