consul-templaterb 1.9.1 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0baeb6d85fa2f689ac4ff09c496188c635affe3c36d4be0646bb12fd98bf788b
-  data.tar.gz: c9a0a12bd22972c20a88ba5cacdebb26f754e831a8c57631b4d2b3d3336512a5
+  metadata.gz: 59bf13c2279da7eb5ba1955ca645420d91033cfb8d608a5a881824bf5492d6ed
+  data.tar.gz: a042648698f120b575308868d60e4dc92dbe47163f5f5c59a7ddd21f7194dac3
 SHA512:
-  metadata.gz: 392d5e80cc2cc910500e5d0d93f0ab5dda3e65396ca745d6881c8cf10fc3775c59d7418af83d4aebbf44cfc55036ed942b41a1ef6eff8ea16a2db65401c8c2eb
-  data.tar.gz: b88eaa96328377e5a7c23fa8283a4165831b57c4cb7861ca71352446711850e5f6afcc392819baee38aeb3ecafdc424fbeada84925be6c52109f9375f9f86b73
+  metadata.gz: 978c146a7bd5f11f5bc3de56e0952c465f0011a24201e3a61268b27a34c4ba641e6f2841bb43911d8a1288c5854147164ed0468dbe3c0f4009e279e8addd724f
+  data.tar.gz: 63989a0b6cfded326d6ede9698163f68cfab2bda46c12a403814f45c89d49fb679d434c7a769581463fdd6d21f3325fb8910a8fcc279c3dd68bca5d846f659d0

data/.rubocop.yml

@@ -7,7 +7,7 @@ Metrics/AbcSize:
   Max: 80
 
 Metrics/BlockLength:
-  Max: 140
+  Max: 145
 
 Metrics/BlockNesting:
   Max: 4

data/.travis.yml

@@ -1,8 +1,8 @@
 language: ruby
 rvm:
-- 2.3
 - 2.4
 - 2.5
+- 2.6
 deploy:
   provider: rubygems
   api_key:

data/CHANGELOG.md

@@ -2,14 +2,29 @@
 
 ## (UNRELEASED)
 
-## 1.9.1
+## 1.9.2 (January 4, 2019)
+
+IMPROVEMENTS:
+
+ * Nicer display of messages at startup
+ * Minor consul-timeline improvements
+
+NEW FEATURES:
+
+ * -M flag to debug memory for templates having leaks
+
+## 1.9.1 (January 3, 2019)
 
 NEW FEATURES:
  
  * Now display effective network bandwidth instead of uncompressed bandwidth
  * for catalog/services and catalog/nodes, now min delay is 15s instead of 30s
 
-## 1.9.0
+IMPROVEMENTS:
+
+ * Removed Ruby 2.3 from Travis, build with Ruby 2.6 in Travis
+
+## 1.9.0 (January 2, 2019)
 
 OPTIMIZATIONS:
 

data/README.md

@@ -138,6 +138,7 @@ $ consul-templaterb --help
 USAGE: consul-templaterb [[options]]
     -h, --help                       Show help
     -v, --version                    Show Version
+    -g, --no-gzip-compression        Disable GZIP compression in HTTP requests
     -c, --consul-addr=<address>      Address of Consul, eg: http://localhost:8500
         --consul-token=<token>       Use a token to connect to Consul
     -V, --vault-addr=<address>       Address of Vault, eg: http://localhost:8200
@@ -151,6 +152,7 @@ USAGE: consul-templaterb [[options]]
     -K, --sig-term=kill_signal       Signal to send to next --exec command on kill, default=TERM
     -T, --trim-mode=trim_mode        ERB Trim mode to use (- by default)
     -R, --sig-reload=reload_signal   Signal to send to next --exec command on reload (NONE supported), default=HUP
+    -M, --debug-memory-usage         Display messages when RAM grows
     -e, --exec=<command>             Execute the following command
     -d, --debug-network-usage        Debug the network usage
     -t erb_file:[output]:[command]:[params_file],

data/bin/consul-templaterb

@@ -157,6 +157,10 @@ optparse = OptionParser.new do |opts|
     cur_sig_reload = compute_signal(sig, 'NONE')
   end
 
+  opts.on('-M', '--debug-memory-usage', 'Display messages when RAM grows') do
+    consul_engine.debug_memory = true
+  end
+
   opts.on('-e', '--exec=<command>', String, 'Execute the following command') do |cmd|
     sig_reload = cur_sig_reload
     sig_term = cur_sig_term
@@ -217,7 +221,6 @@ optparse = OptionParser.new do |opts|
     params = {}
     params = Consul::Async::Utilities.load_parameters_from_file(parameter_file) if parameter_file
     consul_engine.add_template(source, dest, params)
-
     if command
       consul_engine.add_template_callback do |_all_ready, _template_manager, results|
         results.each do |res|

data/lib/consul/async/consul_template.rb

@@ -28,6 +28,7 @@ module Consul
         @endpoints = {}
         @iteration = 1
         @start_time = Time.now.utc
+        @last_debug_time = 0
         @net_info = {
           success: 0,
           errors: 0,
@@ -212,7 +213,10 @@ module Consul
           to_cleanup << endpoint_key if (@iteration - endpt.seen_at) > 60
         end
         if not_ready.count.positive?
-          STDERR.print "[INFO] Waiting for data from #{not_ready.count}/#{not_ready.count + ready} endpoints: #{not_ready[0..2]}..."
+          if @iteration - @last_debug_time > 1
+            @last_debug_time = @iteration
+            STDERR.print "[INFO] #{@last_debug} Waiting for data from #{not_ready.count}/#{not_ready.count + ready} endpoints: #{not_ready[0..2]}..."
+          end
           return [false, false, nil]
         end
         if to_cleanup.count > 1

data/lib/consul/async/consul_template_engine.rb

@@ -9,8 +9,8 @@ require 'erb'
 module Consul
   module Async
     class ConsulTemplateEngine
-      attr_reader :template_manager, :hot_reload_failure, :template_frequency
-      attr_writer :hot_reload_failure, :template_frequency
+      attr_reader :template_manager, :hot_reload_failure, :template_frequency, :debug_memory
+      attr_writer :hot_reload_failure, :template_frequency, :debug_memory
       def initialize
         @templates = []
         @template_callbacks = []
@@ -18,6 +18,17 @@ module Consul
         @all_templates_rendered = false
         @template_frequency = 1
         @periodic_started = false
+        @debug_memory = false
+        @last_memory_state = build_memory_info
+      end
+
+      def build_memory_info
+        s = GC.stat
+        {
+          pages: s[:total_allocated_pages] - s[:total_freed_pages],
+          objects: s[:total_allocated_objects] - s[:total_freed_objects],
+          time: Time.now.utc
+        }
       end
 
       def add_template_callback(&block)
@@ -81,6 +92,21 @@ module Consul
           EventMachine.add_periodic_timer(template_frequency) do
             @periodic_started = true
             do_run(template_manager, template_renders)
+            if debug_memory
+              GC.start
+              new_memory_state = build_memory_info
+              diff_allocated = new_memory_state[:pages] - @last_memory_state[:pages]
+              diff_num_objects = new_memory_state[:objects] - @last_memory_state[:objects]
+              if diff_allocated != 0 || diff_num_objects.abs > (@last_memory_state[:pages] / 3)
+                timediff = new_memory_state[:time] - @last_memory_state[:time]
+                STDERR.puts "[MEMORY] #{new_memory_state[:time]} significant RAM Usage detected\n" \
+                            "[MEMORY] #{new_memory_state[:time]} Pages  : #{new_memory_state[:pages]}" \
+                            " (diff #{diff_allocated} aka #{(diff_allocated / timediff).round(0)}/s) \n" \
+                            "[MEMORY] #{new_memory_state[:time]} Objects: #{new_memory_state[:objects]}"\
+                            " (diff #{diff_num_objects} aka #{(diff_num_objects / timediff).round(0)}/s)"
+                @last_memory_state = new_memory_state
+              end
+            end
           end
         end
       end

data/lib/consul/async/version.rb

@@ -1,5 +1,5 @@
 module Consul
   module Async
-    VERSION = '1.9.1'.freeze
+    VERSION = '1.9.2'.freeze
   end
 end

data/samples/consul-ui/timeline.json.erb

@@ -54,44 +54,46 @@ old_state = if @previous_state
               cur_state
             end
 
-class RingBuffer < Array
-  attr_reader :max_size
-
-  def initialize(max_size:, enum: nil)
-    @max_size = max_size
-    warn "Ringbuffer initialized with #{max_size}"
-    enum&.each { |e| self << e }
-  end
-
-  def <<(element)
-    return unless element
-    if size >= @max_size
-      shift
+unless @events
+  class RingBuffer < Array
+    attr_reader :max_size
+
+    def initialize(max_size:, enum: nil)
+      @max_size = max_size
+      warn "Ringbuffer initialized with #{max_size}"
+      enum&.each { |e| self << e }
     end
-    previous_e = last
-    after = []
-    while !previous_e.nil? && (previous_e['idx'] > element['idx'])
-      after.insert(0, pop)
+
+    def <<(element)
+      return unless element
+      if size >= @max_size
+        shift
+      end
       previous_e = last
+      after = []
+      while !previous_e.nil? && (previous_e['idx'] > element['idx'])
+        after.insert(0, pop)
+        previous_e = last
+      end
+      push(element)
+      after.each do |x|
+        push(x)
+      end
+      self
     end
-    push(element)
-    after.each do |x|
-      push(x)
-    end
-    self
   end
-end
 
-def diff(old, new_e)
-  diff = OpenStruct.new
-  diff.appeared = new_e - old
-  diff.disappeared = old - new_e
-  diff.stayed = new_e & old
-  diff.all = new_e + old
-  diff
-end
+  def diff(old, new_e)
+    diff = OpenStruct.new
+    diff.appeared = new_e - old
+    diff.disappeared = old - new_e
+    diff.stayed = new_e & old
+    diff.all = new_e + old
+    diff
+  end
 
-@events = RingBuffer.new(max_size: (ENV['CONSUL_TIMELINE_BUFFER'] || 10000).to_i) unless @events
+  @events = RingBuffer.new(max_size: (ENV['CONSUL_TIMELINE_BUFFER'] || 10000).to_i)
+end
 @new_events = []
 
 def log_event(line)
@@ -215,4 +217,4 @@ if template_info['was_rendered_once']
   warn "First full rendering completed at #{@current_time} !" unless @previous_state
   @previous_state = cur_state
 end
-%><%= JSON.generate(@events) %>
+%><%= JSON.generate(@events) %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: consul-templaterb
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.9.2
 platform: ruby
 authors:
 - SRE Core Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-03 00:00:00.000000000 Z
+date: 2019-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-http-request