x/terracotta
Code Issues Proposed changes

Fixed migrate_vms to correctly handle completed migrations and time-outs; increased the time-out to 5 minutes

Browse Source
This commit is contained in:
Anton Beloglazov 2012-11-18 20:00:24 +11:00
parent cf6bd47cbc
commit 752216b5de
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
neat/globals/manager.py
View File

@ -747,23 +747,23 @@ def migrate_vms(db, nova, vm_instance_directory, placement):
vm_uuid,
vm_hostname(vm),
vm.status)
time_out = (time.time() - start_time > 120)
if not time_out and \
(vm_hostname(vm) != placement[vm_uuid] or \
vm.status != u'ACTIVE'):
break
else:
if vm_hostname(vm) == placement[vm_uuid] and \
vm.status == u'ACTIVE':
vm_pair.remove(vm_uuid)
if time_out:
retry_placement[vm_uuid] = placement[vm_uuid]
if log.isEnabledFor(logging.WARNING):
log.warning('Time-out for migration of VM %s to %s, ' +
'will retry', vm_uuid, placement[vm_uuid])
else:
db.insert_vm_migration(vm_uuid, placement[vm_uuid])
if log.isEnabledFor(logging.INFO):
log.info('Completed migration of VM %s to %s',
vm_uuid, placement[vm_uuid])
db.insert_vm_migration(vm_uuid, placement[vm_uuid])
if log.isEnabledFor(logging.INFO):
log.info('Completed migration of VM %s to %s',
vm_uuid, placement[vm_uuid])
elif time.time() - start_time > 300 and \
vm_hostname(vm) != placement[vm_uuid] and \
vm.status == u'ACTIVE':
vm_pair.remove(vm_uuid)
retry_placement[vm_uuid] = placement[vm_uuid]
if log.isEnabledFor(logging.WARNING):
log.warning('Time-out for migration of VM %s to %s, ' +
'will retry', vm_uuid, placement[vm_uuid])
else:
break
else:
break
time.sleep(3)