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

test migrate

Browse source
This commit is contained in:
isaac-hammes 2023-09-06 12:37:08 -07:00
parent 3327cc2226
commit b24c30e557
2 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/vmpooler/api/v3.rb
View file

@ -176,7 +176,6 @@ module Vmpooler
def return_vm_to_ready_state(template, vm) def return_vm_to_ready_state(template, vm)
tracer.in_span("Vmpooler::API::V3.#{__method__}") do tracer.in_span("Vmpooler::API::V3.#{__method__}") do
backend.srem("vmpooler__migrating__#{template}", vm)
backend.hdel("vmpooler__active__#{template}", vm) backend.hdel("vmpooler__active__#{template}", vm)
backend.hdel("vmpooler__vm__#{vm}", 'checkout', 'token:token', 'token:user') backend.hdel("vmpooler__vm__#{vm}", 'checkout', 'token:token', 'token:user')
backend.smove("vmpooler__running__#{template}", "vmpooler__ready__#{template}", vm) backend.smove("vmpooler__running__#{template}", "vmpooler__ready__#{template}", vm)

14
lib/vmpooler/pool_manager.rb
View file

@ -852,16 +852,12 @@ module Vmpooler
def migrate_vm(vm_name, pool_name, provider) def migrate_vm(vm_name, pool_name, provider)
Thread.new do Thread.new do
begin mutex = vm_mutex(vm_name)
mutex = vm_mutex(vm_name) mutex.synchronize do
mutex.synchronize do @redis.with_metrics do |redis|
@redis.with_metrics do |redis| redis.srem("vmpooler__migrating__#{pool_name}", vm_name)
redis.srem("vmpooler__migrating__#{pool_name}", vm_name)
end
provider.migrate_vm(pool_name, vm_name)
end end
rescue StandardError => e provider.migrate_vm(pool_name, vm_name)
$logger.log('s', "[x] [#{pool_name}] '#{vm_name}' migration failed with an error: #{e}")
end end
end end
end end