Merge pull request #355 from highb/pooler-154_delay_vm_host_update_until_after_migration

(POOLER-154) Delay vm host update until after migration completes
This commit is contained in:
Brandon High 2020-03-03 16:09:29 -08:00 committed by GitHub
commit f1d6ddec9b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -979,10 +979,10 @@ module Vmpooler
def migrate_vm_to_new_host(pool_name, vm_name, vm_hash, connection)
$redis.sadd('vmpooler__migration', vm_name)
target_host_name = select_next_host(pool_name, @provider_hosts, vm_hash['architecture'])
$redis.hset("vmpooler__vm__#{vm_name}", 'host', target_host_name)
$redis.hset("vmpooler__vm__#{vm_name}", 'migrated', true)
target_host_object = find_host_by_dnsname(connection, target_host_name)
finish = migrate_vm_and_record_timing(pool_name, vm_name, vm_hash, target_host_object, target_host_name)
$redis.hset("vmpooler__vm__#{vm_name}", 'host', target_host_name)
$redis.hset("vmpooler__vm__#{vm_name}", 'migrated', true)
logger.log('s', "[>] [#{pool_name}] '#{vm_name}' migrated from #{vm_hash['host_name']} to #{target_host_name} in #{finish} seconds")
ensure
$redis.srem('vmpooler__migration', vm_name)