diff --git a/lib/vmpooler/api/v1.rb b/lib/vmpooler/api/v1.rb index 140eaff..29406f8 100644 --- a/lib/vmpooler/api/v1.rb +++ b/lib/vmpooler/api/v1.rb @@ -5,7 +5,6 @@ require 'vmpooler/util/parsing' module Vmpooler class API class V1 < Sinatra::Base - api_version = '1' api_prefix = "/api/v#{api_version}" @@ -339,6 +338,7 @@ module Vmpooler def too_many_requested?(payload) payload&.each do |poolname, count| next unless count.to_i > config['max_ondemand_instances_per_request'] + metrics.increment('ondemandrequest.toomanyrequests.' + poolname) return true end @@ -979,7 +979,7 @@ module Vmpooler if request_hash['status'] == 'ready' result['ready'] = true - Parsing.get_platform_pool_count(request_hash['requested']) do |platform_alias,pool,_count| + 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 @@ -992,7 +992,7 @@ module Vmpooler result['message'] = 'The request has been deleted' status 200 else - Parsing.get_platform_pool_count(request_hash['requested']) do |platform_alias,pool,count| + 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, @@ -1018,7 +1018,7 @@ module Vmpooler else backend.hset("vmpooler__odrequest__#{request_id}", 'status', 'deleted') - Parsing.get_platform_pool_count(platforms) do |platform_alias,pool,_count| + 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 diff --git a/lib/vmpooler/pool_manager.rb b/lib/vmpooler/pool_manager.rb index b5f97a6..bed6a48 100644 --- a/lib/vmpooler/pool_manager.rb +++ b/lib/vmpooler/pool_manager.rb @@ -1501,7 +1501,7 @@ module Vmpooler def vms_ready?(request_id, redis) catch :request_not_ready do request_hash = redis.hgetall("vmpooler__odrequest__#{request_id}") - Parsing.get_platform_pool_count(request_hash['requested']) do |platform_alias,pool,count| + 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 @@ -1553,7 +1553,7 @@ module Vmpooler def remove_vms_for_failed_request(request_id, expiration_ttl, redis) request_hash = redis.hgetall("vmpooler__odrequest__#{request_id}") - Parsing.get_platform_pool_count(request_hash['requested']) do |platform_alias,pool,_count| + 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| diff --git a/lib/vmpooler/util/parsing.rb b/lib/vmpooler/util/parsing.rb index a44b716..92125ce 100644 --- a/lib/vmpooler/util/parsing.rb +++ b/lib/vmpooler/util/parsing.rb @@ -1,11 +1,13 @@ +# frozen_string_literal: true # utility class shared between apps module Vmpooler class Parsing - def self.get_platform_pool_count(requested, &block) + 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