vmpooler 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13821cbed5546dca2c06d551c7085619f011cc1b
-  data.tar.gz: d3c6dea081a11077cf42c8951b01c72ebf8ef420
+  metadata.gz: 03cf2be498c698d23100da26391cef6f2a63bb87
+  data.tar.gz: f239eb2ccb445f4ef5a6dc31bad5cdd80fb02f37
 SHA512:
-  metadata.gz: c1fdfe8601ff5922b6de1630428a30e155fa6d3db5e1e1b75ad68b5368f6724382f495ce1d2e13af8a2db5243bc26d3e0519b059ac7c0bdce657d37d49aed707
-  data.tar.gz: cd19df2ac6912d190528a5c24ae24fe253303437e3bdf4c038b75276a64aac7e8f6fd82fd7dc149bf509be5d981b74a48e8fa6b939559128109ca29a0c908dea
+  metadata.gz: 83d8fbf7d283098ead4b860e83fe4f1cee94760450fe240609678137581a33c7007bd2bc33e9cfaeb73f91eff59b71eedd4f9cacec6b661499deb33846bab746
+  data.tar.gz: 28983a8ffa2a190699f0169de957ee182a2194abb96f1aa42f62e17d32f5085fd36afd24c014f649142766594cd4e9e85cd682f273fa78e5ee297f577d6a2094

data/lib/vmpooler/api/helpers.rb

@@ -470,6 +470,29 @@ module Vmpooler
       rescue
         false
       end
+
+      def open_socket(host, domain = nil, timeout = 1, port = 22, &_block)
+        Timeout.timeout(timeout) do
+          target_host = host
+          target_host = "#{host}.#{domain}" if domain
+          sock = TCPSocket.new target_host, port
+          begin
+            yield sock if block_given?
+          ensure
+            sock.close
+          end
+        end
+      end
+
+      def vm_ready?(vm_name, domain = nil)
+        begin
+          open_socket(vm_name, domain)
+        rescue => _err
+          return false
+        end
+
+        true
+      end
     end
   end
 end

data/lib/vmpooler/api/v1.rb

@@ -68,10 +68,17 @@ module Vmpooler
       end
 
       template_backends.each do |template_backend|
-        vm = backend.smembers("vmpooler__ready__#{template_backend}")[-1]
-        if vm
-          backend.smove("vmpooler__ready__#{template_backend}", "vmpooler__running__#{template_backend}", vm)
-          return [vm, template_backend, template]
+        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]

data/lib/vmpooler/version.rb

@@ -1,3 +1,3 @@
 module Vmpooler
-  VERSION = '0.6.1'.freeze
+  VERSION = '0.6.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vmpooler
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-08 00:00:00.000000000 Z
+date: 2019-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pickup