puppetlabs/vmpooler
2
0
Fork 0
mirror of https://github.com/puppetlabs/vmpooler.git synced 2026-01-26 18:08:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

(POOLER-141) Fix order of processing migrating and pending queues

Browse source 
This commit updates how migrating and pending queues are processed. Sets to be processed are created with sadd in redis, and iterated over as a list in ruby. The latest member is added to the beginning of this set in redis, and becomes the first member of the set in ruby. To ensure that items are processed in the order they are added it is necessary to reverse the list before iterating through its members. Without this change the newest members of the set are processed first, which creates inconsistent times to evaluation.
This commit is contained in:
kirby@puppetlabs.com 2019-04-11 12:29:05 -07:00
parent 5351c9f45e
commit 2d94cb4266
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/vmpooler/pool_manager.rb
View file

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