vmpooler 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f2b96fa5c2f5c53f50a4e9fb7f975ec3a8716ed
-  data.tar.gz: 88e04c8a5cad4a0b1116660153106d3ef0b556c6
+  metadata.gz: cd60a55d3a131c27874348c38051f1955e668df4
+  data.tar.gz: 2a5793546f767b4470b2c5380e6630539003808f
 SHA512:
-  metadata.gz: 29b21da273ee6583f800719eb92f0ff1e85db0f32d019e1098f2ee4efa821741215b38c1048f32a09e231c3310c1a76605f53dcf86c3204260928b2938cd63b5
-  data.tar.gz: b607db6ad966d5c07d9110f51a21e89b2a4a5a4762dfb0607277cd23b4f1b66a55f3245e0434ea978c78cc379b71012b96a8e50224101f96504b83ae8bb88120
+  metadata.gz: 29a1374e8f4b5d26f31747764b58a191e9f232195ba5ae397c1f25f752724c6c0466d3bf579e4e87992f24ab7de830ed3c12d1242581ba4b27ac20c5f3af3cea
+  data.tar.gz: 90ca0afcb191e9c956fe30bd11e568e9a9d040a8410833556f44e10d5ab6d960c1a7dcc9e4b77c171fb4e327ca3c30b411a67a6ff35e8013c7a2c4a54a0109a9

data/lib/vmpooler/api/v1.rb

@@ -341,6 +341,79 @@ module Vmpooler
       JSON.pretty_generate(Hash[result.sort_by { |k, _v| k }])
     end
 
+    # request statistics for specific pools by passing parameter 'pool'
+    # with a coma separated list of pools we want to query ?pool=ABC,DEF
+    # returns the ready, max numbers and the aliases (if set)
+    get "#{api_prefix}/poolstat/?" do
+      content_type :json
+
+      result = {}
+
+      poolscopy = []
+
+      if params[:pool]
+        subpool = params[:pool].split(",")
+        poolscopy = pools.select do |p|
+          if subpool.include?(p['name'])
+            true
+          elsif !p['alias'].nil?
+            if p['alias'].is_a?(Array)
+              (p['alias'] & subpool).any?
+            elsif p['alias'].is_a?(String)
+              subpool.include?(p['alias'])
+            end
+          end
+        end
+      end
+
+      result[:pools] = {}
+
+      poolscopy.each do |pool|
+        result[:pools][pool['name']] = {}
+
+        max      = pool['size']
+        aka      = pool['alias']
+
+        result[:pools][pool['name']][:max] = max
+
+        if aka
+          result[:pools][pool['name']][:alias] = aka
+        end
+
+      end
+
+      # using pipelined is much faster than querying each of the pools
+      res = backend.pipelined do
+        poolscopy.each do |pool|
+          backend.scard('vmpooler__ready__' + pool['name'])
+        end
+      end
+
+      res.each_with_index { |ready, i| result[:pools][poolscopy[i]['name']][:ready] = ready }
+
+      JSON.pretty_generate(Hash[result.sort_by { |k, _v| k }])
+    end
+
+    # requests the total number of running VMs
+    get "#{api_prefix}/totalrunning/?" do
+      content_type :json
+      queue = {
+          running:   0,
+      }
+
+      # using pipelined is much faster than querying each of the pools and adding them
+      # as we get the result.
+      res = backend.pipelined do
+        pools.each do |pool|
+          backend.scard('vmpooler__running__' + pool['name'])
+        end
+      end
+
+      queue[:running] = res.inject(0){ |m, x| m+x }
+
+      JSON.pretty_generate(queue)
+    end
+
     get "#{api_prefix}/summary/?" do
       content_type :json
 

data/lib/vmpooler/pool_manager.rb

@@ -943,7 +943,7 @@ module Vmpooler
 
     def check_pending_pool_vms(pool_name, provider, pool_check_response, inventory, pool_timeout = nil)
       pool_timeout ||= $config[:config]['timeout'] || 15
-      $redis.smembers("vmpooler__pending__#{pool_name}").each do |vm|
+      $redis.smembers("vmpooler__pending__#{pool_name}").reverse.each do |vm|
         if inventory[vm]
           begin
             pool_check_response[:checked_pending_vms] += 1
@@ -980,7 +980,7 @@ module Vmpooler
 
     def check_discovered_pool_vms(pool_name)
       begin
-        $redis.smembers("vmpooler__discovered__#{pool_name}").each do |vm|
+        $redis.smembers("vmpooler__discovered__#{pool_name}").reverse.each do |vm|
           %w[pending ready running completed].each do |queue|
             if $redis.sismember("vmpooler__#{queue}__#{pool_name}", vm)
               $logger.log('d', "[!] [#{pool_name}] '#{vm}' found in '#{queue}', removed from 'discovered' queue")
@@ -998,7 +998,7 @@ module Vmpooler
     end
 
     def check_migrating_pool_vms(pool_name, provider, pool_check_response, inventory)
-      $redis.smembers("vmpooler__migrating__#{pool_name}").each do |vm|
+      $redis.smembers("vmpooler__migrating__#{pool_name}").reverse.each do |vm|
         if inventory[vm]
           begin
             pool_check_response[:migrated_vms] += 1

data/lib/vmpooler/version.rb

@@ -1,3 +1,3 @@
 module Vmpooler
-  VERSION = '0.5.1'.freeze
+  VERSION = '0.6.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vmpooler
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-11 00:00:00.000000000 Z
+date: 2019-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pickup