kitchen_hooks 1.7.4 → 1.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76f1021d1694ab9769980460d4ac30be16ded1f2
-  data.tar.gz: dfb8c50fc2242602bcaf3862458a8479a72d0611
+  metadata.gz: ef6e686e12474334dac278347907e0217f4c6988
+  data.tar.gz: bffb695626d6390acaf5d20aeacdc10900d819fa
 SHA512:
-  metadata.gz: 833bc6076be34537ca8bff79a336093fabf83b039d9bcc68d3b728d05585a4bf531b74e10e19364b737c0018cc45366800925e56e774fb41f005ee204ecb0121
-  data.tar.gz: ff3bd026d78c11825fab7c59d28ea0784e28d18e00c1befb008dfa98c0828c4ded6992cbf202498292515288547d3a18deff33edc24a752265aec53029314673
+  metadata.gz: 7cce1b540f68b1c9b5c29001dc973e9237a16c02cfa5ce9c725f5169b9794dc29e09999842b4140d22c52ba741530315773b9769fe27117a9131f3c86709da66
+  data.tar.gz: 53b7d4986200d24f82cdac784045506583e3b0a90e3808b2f94f2880215cb8095386f7485d7e34c7e755d4fe0f65b9c8da1af02600d9ee4316612ec6cc8f21db

data/VERSION

@@ -1 +1 @@
-1.7.4
+1.7.5

data/etc/config.json

@@ -1,4 +1,5 @@
 {
+  "sync_interval": 30,
   "hipchat": null,
   "knives": {
     "bng11": "~/.chef/bng11.rb",

data/lib/kitchen_hooks/app.rb

@@ -43,8 +43,8 @@ module KitchenHooks
     def self.sync!
       @@sync_worker = Thread.new do
         loop do
-          sleep @@sync_interval
           process_sync
+          sleep @@sync_interval
         end
       end
     end
@@ -144,13 +144,21 @@ module KitchenHooks
 
     def self.process_release version=KitchenHooks::VERSION
       return if db['meta_version'] == version
-      db.set! 'meta_version', version
+      db.lock do
+        db.set! 'meta_version', version
+      end
       mark version, 'release'
     end
 
 
     def self.process_sync
-      sync = sync_servers(knives).status
+      cached_nodes = db['meta_cached_nodes']
+      cached_nodes ||= {}
+      sync_servers = SyncServers.new knives, cached_nodes
+      db.lock do
+        db.set! 'meta_cached_nodes', sync_servers.cached_nodes
+      end
+      sync = sync_servers.status
 
       if sync.nil?
         mark "Couldn't sync Chef servers (unknown issue)", 'unsynced'
@@ -158,7 +166,6 @@ module KitchenHooks
       end
 
       sync_tag = sync[:num_failures].zero? ? 'synced' : 'unsynced'
-
       mark sync, sync_tag
     end
 

data/lib/kitchen_hooks/helpers.rb

@@ -42,10 +42,6 @@ module KitchenHooks
       }.compact.reverse.join(' ')
     end
 
-    def self.sync_servers knives
-      SyncServers.new knives
-    end
-
 
     def self.report_error e, msg=nil
       msg = e.message if msg.nil?

data/lib/kitchen_hooks/helpers/sync_servers.rb

@@ -6,14 +6,18 @@ require 'set'
 class SyncServers
   attr_reader :status
 
-
-  def initialize knives
+  def initialize knives, cached_nodes={}
     @knives  = knives
     @started = Time.now
-    @status  = sync_servers.merge \
+    @cached_nodes = Hash.new { |h,k| h[k] = 0.0 }
+    @cached_nodes.merge! cached_nodes
+    @status = sync_servers.merge \
       elapsed: Time.now - @started rescue nil
   end
 
+  def cached_nodes
+    Hash[@cached_nodes]
+  end
 
 
 private
@@ -25,11 +29,11 @@ private
   end
 
 
-  def all_nodes
-    @clients ||= {}
+  def search_nodes
+    @clients = {}
     bad_ridleys = []
 
-    @all_nodes ||= ridleys.each_with_index.pmap(4) do |ridley, i|
+    @search_nodes ||= ridleys.each_with_index.pmap(4) do |ridley, i|
       clients = ridley.client.all
 
       begin
@@ -51,25 +55,33 @@ private
       @ridleys.delete_at idx
     end
 
-    return @all_nodes
+    return @search_nodes
   end
 
 
-  def merged_nodes
-    @merged_nodes ||= all_nodes.group_by(&:name).pmap do |_, copies|
+  def updated_and_deleted_nodes
+    @all_nodes ||= search_nodes.group_by(&:name).pmap do |name, copies|
       copies.sort_by do |c|
         time = c.automatic.ohai_time
         time.is_a?(Float) ? time : -1.0
       end.last
     end
+
+    @updated_nodes ||= @all_nodes.select do |n|
+      n.automatic.ohai_time.to_f > @cached_nodes[n.name]
+    end
+
+    @deleted_nodes ||= @cached_nodes.keys - @all_nodes.map(&:name)
+
+    return @updated_nodes, @deleted_nodes
   end
 
 
   def sync_servers
-    nodes = merged_nodes
+    nodes, deleted = updated_and_deleted_nodes
     failures = Set.new
 
-    nodes.peach(8) do |n|
+    nodes.shuffle.peach(8) do |n|
       n.reload
 
       ridleys.peach(4) do |ridley|
@@ -84,18 +96,40 @@ private
         rescue puts('WARNING: Client sync failed for node "%s"' % n.name)
       end
 
-      puts 'Synced node "%s"' % n.name
+      if failures.include? n.name
+        puts 'ERROR: Node sync failed for node "%s"' % n.name
+      else
+        puts 'Synced node "%s"' % n.name
+      end
     end unless @ridleys.length == 1
 
+    successes = []
+    nodes.each do |n|
+      next if failures.include? n.name
+      @cached_nodes[n.name] = n.automatic.ohai_time.to_f
+      successes << n
+    end
+
+    deleted.each do |n|
+      puts 'Deleting node "%s"' % n
+      ridleys.peach(4) do |ridley|
+        ridley.node.delete n rescue \
+          puts('WARNING: Could not delete node "%s"' % n)
+      end
+    end
+
     puts 'Sync completed'
     return {
+      deleted: deleted,
       failures: failures,
+      successes: successes,
       num_successes: nodes.length - failures.length,
       num_failures: failures.length,
+      num_deletions: deleted.length,
       num_nodes: nodes.length
     }
-  rescue
-    return nil
+  # rescue
+  #   return nil
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen_hooks
 version: !ruby/object:Gem::Version
-  version: 1.7.4
+  version: 1.7.5
 platform: ruby
 authors:
 - Sean Clemmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-17 00:00:00.000000000 Z
+date: 2015-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hipchat