Commit 62457f51 authored by Iustin Pop's avatar Iustin Pop

Fix type error in kvm/GetMigrationStatus

Commit 6a1434d7 (“Make migration RPC non-blocking”) changed from
raising HypervisorErrors to returning MigrationStatus
objects. However, these objects don't have an "info" attribute, so
they can't pass a reason back (which is in itself a bug); but the KVM
hypervisor code attempts to do so, and fails at runtime with:

  Failed to get migration status: 'MigrationStatus' object has no attribute 'info'

instead of the intended:

  Migration failed, aborting: too many broken 'info migrate' answers

For now (on stable-2.6), let's just remove the "info" reason, and
later we can add it back properly once we have a way to correctly
represent migration status failures in the LU.

This fixes issue 297.
Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
parent a4c0fe1e
......@@ -1780,8 +1780,7 @@ class KVMHypervisor(hv_base.BaseHypervisor):
time.sleep(self._MIGRATION_INFO_RETRY_DELAY)
return objects.MigrationStatus(status=constants.HV_MIGRATION_FAILED,
info="Too many 'info migrate' broken answers")
return objects.MigrationStatus(status=constants.HV_MIGRATION_FAILED)
def BalloonInstanceMemory(self, instance, mem):
"""Balloon an instance memory to a certain value.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment