vmpooler 0.13.2 → 0.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a200f3215b389575c605363ed55bb21b9a1779084cee39fef88fe28c2a51e9ab
-  data.tar.gz: fd48ee0ff0fd5ea1f19dbd0b19bce49d821b0a17ef6f62aca91804cbdebc7d88
+  metadata.gz: fe0ef9bcf3e665cc952fce0975a4381883fca200ef93a883e54c7db7e1fc10e7
+  data.tar.gz: d44b61c41a57f940cf0df4bf07aabed10b1a72e91cae5b2105f092a7d98d6d05
 SHA512:
-  metadata.gz: 63df277bab9ab5f049886d30166856ba5adfc85119e3408d91339827f6b05d3b12dde49c78c051c23d90bf123590e14d6cc7e41598cd315f2df9637a5c7c7042
-  data.tar.gz: 3f6ce744a9c792c12800d7da0b6738e995d8f9a0cbc86bd3635977b3c463765b371100f5ea3ad509a15b7bd83be5bf37e4ea72cf7004535a36afe263577ed356
+  metadata.gz: e0e7bbec11ceecc5fdee0fe15b3d37e290a6c884a708a6a5acb2e790d54fb1f1e24ec6966973f02bbecd204a29497e9c17ae3b8be26a0d3f15cec508a0d64532
+  data.tar.gz: 7302cf41676a65ff5d0bb4108a8f5ac03a96a92e3cd0ec56deee2f2a60d6e73f09eee569ef0f4140e3c27e81a16c3e2d24b951764a772bdeaa082a96d8bde1fe

data/lib/vmpooler/api/v1.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'vmpooler/util/parsing'
+
 module Vmpooler
   class API
   class V1 < Sinatra::Base
@@ -334,9 +336,10 @@ module Vmpooler
     end
 
     def too_many_requested?(payload)
-      payload&.each do |_poolname, count|
+      payload&.each do |poolname, count|
         next unless count.to_i > config['max_ondemand_instances_per_request']
 
+        metrics.increment('ondemandrequest.toomanyrequests.' + poolname)
         return true
       end
       false
@@ -360,6 +363,7 @@ module Vmpooler
       if backend.exists("vmpooler__odrequest__#{request_id}")
         result['message'] = "request_id '#{request_id}' has already been created"
         status 409
+        metrics.increment('ondemandrequest.generate.duplicaterequests')
         return result
       end
 
@@ -383,6 +387,7 @@ module Vmpooler
 
       result['domain'] = config['domain'] if config['domain']
       result[:ok] = true
+      metrics.increment('ondemandrequest.generate.success')
       result
     end
 
@@ -974,11 +979,9 @@ module Vmpooler
 
       if request_hash['status'] == 'ready'
         result['ready'] = true
-        platform_parts = request_hash['requested'].split(',')
-        platform_parts.each do |platform|
-          pool_alias, pool, _count = platform.split(':')
-          instances = backend.smembers("vmpooler__#{request_id}__#{pool_alias}__#{pool}")
-          result[pool_alias] = { 'hostname': instances }
+        Parsing.get_platform_pool_count(request_hash['requested']) do |platform_alias, pool, _count|
+          instances = backend.smembers("vmpooler__#{request_id}__#{platform_alias}__#{pool}")
+          result[platform_alias] = { 'hostname': instances }
         end
         result['domain'] = config['domain'] if config['domain']
         status 200
@@ -989,11 +992,9 @@ module Vmpooler
         result['message'] = 'The request has been deleted'
         status 200
       else
-        platform_parts = request_hash['requested'].split(',')
-        platform_parts.each do |platform|
-          pool_alias, pool, count = platform.split(':')
-          instance_count = backend.scard("vmpooler__#{request_id}__#{pool_alias}__#{pool}")
-          result[pool_alias] = {
+        Parsing.get_platform_pool_count(request_hash['requested']) do |platform_alias, pool, count|
+          instance_count = backend.scard("vmpooler__#{request_id}__#{platform_alias}__#{pool}")
+          result[platform_alias] = {
             'ready': instance_count.to_s,
             'pending': (count.to_i - instance_count.to_i).to_s
           }
@@ -1017,12 +1018,11 @@ module Vmpooler
       else
         backend.hset("vmpooler__odrequest__#{request_id}", 'status', 'deleted')
 
-        platforms.split(',').each do |platform|
-          pool_alias, pool, _count = platform.split(':')
-          backend.smembers("vmpooler__#{request_id}__#{pool_alias}__#{pool}")&.each do |vm|
+        Parsing.get_platform_pool_count(platforms) do |platform_alias, pool, _count|
+          backend.smembers("vmpooler__#{request_id}__#{platform_alias}__#{pool}")&.each do |vm|
             backend.smove("vmpooler__running__#{pool}", "vmpooler__completed__#{pool}", vm)
           end
-          backend.del("vmpooler__#{request_id}__#{pool_alias}__#{pool}")
+          backend.del("vmpooler__#{request_id}__#{platform_alias}__#{pool}")
         end
         backend.expire("vmpooler__odrequest__#{request_id}", 129_600_0)
       end

data/lib/vmpooler/pool_manager.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'vmpooler/providers'
+require 'vmpooler/util/parsing'
 require 'spicy-proton'
 require 'resolv' # ruby standard lib
 
@@ -1500,9 +1501,7 @@ module Vmpooler
     def vms_ready?(request_id, redis)
       catch :request_not_ready do
         request_hash = redis.hgetall("vmpooler__odrequest__#{request_id}")
-        requested_platforms = request_hash['requested'].split(',')
-        requested_platforms.each do |platform|
-          platform_alias, pool, count = platform.split(':')
+        Parsing.get_platform_pool_count(request_hash['requested']) do |platform_alias, pool, count|
           pools_filled = redis.scard("vmpooler__#{request_id}__#{platform_alias}__#{pool}")
           throw :request_not_ready unless pools_filled.to_i == count.to_i
         end
@@ -1554,9 +1553,7 @@ module Vmpooler
 
     def remove_vms_for_failed_request(request_id, expiration_ttl, redis)
       request_hash = redis.hgetall("vmpooler__odrequest__#{request_id}")
-      requested_platforms = request_hash['requested'].split(',')
-      requested_platforms.each do |platform|
-        platform_alias, pool, _count = platform.split(':')
+      Parsing.get_platform_pool_count(request_hash['requested']) do |platform_alias, pool, _count|
         pools_filled = redis.smembers("vmpooler__#{request_id}__#{platform_alias}__#{pool}")
         redis.pipelined do
           pools_filled&.each do |vm|

data/lib/vmpooler/util/parsing.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+# utility class shared between apps
+module Vmpooler
+  class Parsing
+    def self.get_platform_pool_count(requested, &_block)
+      requested_platforms = requested.split(',')
+      requested_platforms.each do |platform|
+        platform_alias, pool, count = platform.split(':')
+        raise ArgumentError if platform_alias.nil? || pool.nil? || count.nil?
+
+        yield platform_alias, pool, count
+      end
+    end
+  end
+end

data/lib/vmpooler/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Vmpooler
-  VERSION = '0.13.2'
+  VERSION = '0.13.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vmpooler
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.13.3
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-05 00:00:00.000000000 Z
+date: 2020-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pickup
@@ -229,6 +229,7 @@ files:
 - lib/vmpooler/public/lib/jquery.min.js
 - lib/vmpooler/public/vmpooler.css
 - lib/vmpooler/statsd.rb
+- lib/vmpooler/util/parsing.rb
 - lib/vmpooler/version.rb
 - lib/vmpooler/views/dashboard.erb
 - lib/vmpooler/views/layout.erb
@@ -251,7 +252,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: vmpooler provides configurable pools of instantly-available (running) virtual