vmpooler 0.9.1 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 09dd1d718bab583f033ebc481fbfd9f7041c8d9d039dd20c6df4b4e55e1e477c
-  data.tar.gz: aebd0b6ec5fe9101a65182c40237cb80bbb99c0debf86ea469955d2ad0529d5a
+  metadata.gz: 3f8a23a9dbbb4ee9369c39b366e53966c0c4d29eb959c8b21f3bdfd4620f3255
+  data.tar.gz: 9f13c353a75106ba0613fada05bc6fa1d8015d363389a906234394b6ecb27eea
 SHA512:
-  metadata.gz: 0f2393c6caf7a36dfa58837e30d6f57a804ede99b53b26096c70c0fdfdee21871432ca82f346b5a92a8a5cb597ce79b357f003c5047ba18406eef3b73bb8f637
-  data.tar.gz: 192f1fde3e83f5a53a46d08572955295a7f64747d73ece4f0a2b5306f9de7a92ff09ca1dc13e4be236526185694dda9365d39706d7f521fd769a54c1b6358a60
+  metadata.gz: 4a2268acc778c67da116626ea346767b1eeec7034f145c283c931640f52904267449dcff7e03c2865fb59abc3becabc48ab47416e04a08c959b216d72f7e544c
+  data.tar.gz: 99ae57d9df5b2185927be56b1c28752df50a0b6e28ba5d6d3725c7b310f84299eaf11ee11fe691ce89209947c2142887aaced83537f2cd5ad63442886d433349

data/lib/vmpooler/api/v1.rb

@@ -200,6 +200,17 @@ module Vmpooler
       result
     end
 
+    def reset_pool(payload)
+      result = { 'ok' => false }
+
+      payload.each do |poolname, count|
+        backend.sadd('vmpooler__poolreset', poolname)
+      end
+      status 201
+      result['ok'] = true
+      result
+    end
+
     def update_clone_target(payload)
       result = { 'ok' => false }
 
@@ -1081,6 +1092,44 @@ module Vmpooler
       JSON.pretty_generate(result)
     end
 
+    post "#{api_prefix}/poolreset/?" do
+      content_type :json
+      result = { 'ok' => false }
+
+      if config['experimental_features']
+        need_token! if Vmpooler::API.settings.config[:auth]
+
+        begin
+          payload = JSON.parse(request.body.read)
+          if payload
+            invalid = invalid_templates(payload)
+            if invalid.empty?
+              result = reset_pool(payload)
+            else
+              invalid.each do |bad_pool|
+                metrics.increment("poolreset.invalid.#{bad_pool}")
+              end
+              result[:bad_pools] = invalid
+              status 400
+            end
+          else
+            metrics.increment('poolreset.invalid.unknown')
+            status 404
+          end
+        rescue JSON::ParserError
+          status 400
+          result = {
+            'ok' => false,
+            'message' => 'JSON payload could not be parsed'
+          }
+        end
+      else
+        status 405
+      end
+
+      JSON.pretty_generate(result)
+    end
+
     post "#{api_prefix}/config/clonetarget/?" do
       content_type :json
       result = { 'ok' => false }

data/lib/vmpooler/pool_manager.rb

@@ -714,6 +714,10 @@ module Vmpooler
     #   - Fires when a template configuration update is requested
     #   - Additional options
     #       :poolname
+    # :pool_reset
+    #   - Fires when a pool reset is requested
+    #   - Additional options
+    #       :poolname
     #
     def sleep_with_wakeup_events(loop_delay, wakeup_period = 5, options = {})
       exit_by = Time.now + loop_delay
@@ -760,6 +764,10 @@ module Vmpooler
             end
           end
 
+          if options[:pool_reset]
+            break if $redis.sismember('vmpooler__poolreset', options[:poolname])
+          end
+
         end
 
         break if time_passed?(:exit_by, exit_by)
@@ -797,7 +805,7 @@ module Vmpooler
               loop_delay = (loop_delay * loop_delay_decay).to_i
               loop_delay = loop_delay_max if loop_delay > loop_delay_max
             end
-            sleep_with_wakeup_events(loop_delay, loop_delay_min, pool_size_change: true, poolname: pool['name'], pool_template_change: true, clone_target_change: true)
+            sleep_with_wakeup_events(loop_delay, loop_delay_min, pool_size_change: true, poolname: pool['name'], pool_template_change: true, clone_target_change: true, pool_reset: true)
 
             unless maxloop.zero?
               break if loop_count >= maxloop
@@ -951,6 +959,17 @@ module Vmpooler
       end
     end
 
+    def reset_pool(pool)
+      poolname = pool['name']
+      return unless $redis.sismember('vmpooler__poolreset', poolname)
+      $redis.srem('vmpooler__poolreset', poolname)
+      mutex = pool_mutex(poolname)
+      mutex.synchronize do
+        drain_pool(poolname)
+        $logger.log('s', "[*] [#{poolname}] reset has cleared ready and pending instances")
+      end
+    end
+
     def create_inventory(pool, provider, pool_check_response)
       inventory = {}
       begin
@@ -1159,6 +1178,9 @@ module Vmpooler
       # Remove VMs in excess of the configured pool size
       remove_excess_vms(pool)
 
+      # Reset a pool when poolreset is requested from the API
+      reset_pool(pool)
+
       pool_check_response
     end
 

data/lib/vmpooler/version.rb

@@ -1,3 +1,3 @@
 module Vmpooler
-  VERSION = '0.9.1'.freeze
+  VERSION = '0.10.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vmpooler
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.2
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-28 00:00:00.000000000 Z
+date: 2020-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pickup