vmpooler 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4940c5033dca65a8f33211c244ff5cdd84e4635
-  data.tar.gz: f5703c6f878c4173f56f83d6933ea5350cd5bc90
+  metadata.gz: 18126b74e4adebbee73caa9f3e676c02b90cb309
+  data.tar.gz: c39e9a2391865688b5acb66e191145c63fae9ab6
 SHA512:
-  metadata.gz: f1a1163e7922cc703d1e2621e612cdda05a50b95c63d4b7893b5e418371b7ac5c142b39ee6b3e5e10d20235262fbb0a906e30c63547cb148087f9d77af8b11f2
-  data.tar.gz: fe6d94b28686ef8e5436ec7efc772525b16dcfe45c49a78dce2f8ce0bc19f92b88d39735c0c898aaae351a0386e38f2f93512c43ce2a15e50b6c821217d96c29
+  metadata.gz: a580a1eb9e085541434f5711879d9a99a17bab90bf8680789dde160940b0f36e2d6308cfab211cb39e76ac217da7825e356b6d727eedf8f1d2867e8edc6c623a
+  data.tar.gz: 39b7bfa786001efad19a7a48cc73536ea7e941eee006e8f15a959f4e551267532211d6a49e7cb42b10f8f0720621d2282c4fd40c4a386eca2befee4814e61ba5

data/lib/vmpooler/api/v1.rb

@@ -36,6 +36,10 @@ module Vmpooler
       validate_token(backend)
     end
 
+    def checkoutlock
+      Vmpooler::API::settings.checkoutlock
+    end
+
     def fetch_single_vm(template)
       template_backends = [template]
       aliases = Vmpooler::API.settings.config[:alias]
@@ -67,21 +71,23 @@ module Vmpooler
         end
       end
 
-      template_backends.each do |template_backend|
-        vms = backend.smembers("vmpooler__ready__#{template_backend}")
-        next if vms.empty?
-        vms.reverse.each do |vm|
-          ready = vm_ready?(vm, config['domain'])
-          if ready
-            backend.smove("vmpooler__ready__#{template_backend}", "vmpooler__running__#{template_backend}", vm)
-            return [vm, template_backend, template]
-          else
-            backend.smove("vmpooler__ready__#{template_backend}", "vmpooler__completed__#{template_backend}", vm)
-            metrics.increment("checkout.nonresponsive.#{template_backend}")
+      checkoutlock.synchronize do
+        template_backends.each do |template_backend|
+          vms = backend.smembers("vmpooler__ready__#{template_backend}")
+          next if vms.empty?
+          vms.reverse.each do |vm|
+            ready = vm_ready?(vm, config['domain'])
+            if ready
+              backend.smove("vmpooler__ready__#{template_backend}", "vmpooler__running__#{template_backend}", vm)
+              return [vm, template_backend, template]
+            else
+              backend.smove("vmpooler__ready__#{template_backend}", "vmpooler__completed__#{template_backend}", vm)
+              metrics.increment("checkout.nonresponsive.#{template_backend}")
+            end
           end
         end
+        [nil, nil, nil]
       end
-      [nil, nil, nil]
     end
 
     def return_vm_to_ready_state(template, vm)

data/lib/vmpooler/api.rb

@@ -40,6 +40,7 @@ module Vmpooler
       self.settings.set :config, config
       self.settings.set :redis, redis
       self.settings.set :metrics, metrics
+      self.settings.set :checkoutlock, Mutex.new
     end
 
     def execute!

data/lib/vmpooler/pool_manager.rb

@@ -156,8 +156,14 @@ module Vmpooler
         $redis.hset('vmpooler__vm__' + vm, 'check', Time.now)
         # Check if the hosts TTL has expired
         if ttl > 0
-          # host['boottime'] may be nil if host is not powered on
-          if ((Time.now - host['boottime']) / 60).to_s[/^\d+\.\d{1}/].to_f > ttl
+          # if 'boottime' is nil, set bootime to beginning of unix epoch, forces TTL to be assumed expired
+          boottime = $redis.hget("vmpooler__vm__#{vm}", 'ready')
+          if boottime
+            boottime = Time.parse(boottime)
+          else
+            boottime = Time.at(0)
+          end
+          if ((Time.now - boottime) / 60).to_s[/^\d+\.\d{1}/].to_f > ttl
             $redis.smove('vmpooler__ready__' + pool_name, 'vmpooler__completed__' + pool_name, vm)
 
             $logger.log('d', "[!] [#{pool_name}] '#{vm}' reached end of TTL after #{ttl} minutes, removed from 'ready' queue")

data/lib/vmpooler/version.rb

@@ -1,3 +1,3 @@
 module Vmpooler
-  VERSION = '0.7.1'.freeze
+  VERSION = '0.7.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vmpooler
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-26 00:00:00.000000000 Z
+date: 2019-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pickup