diff options
| author | Kei Masumoto <masumotok@nttdata.co.jp> | 2011-04-11 14:48:00 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-04-11 14:48:00 +0000 |
| commit | 8ae129ace401a1493cd953d3f4b9ecc22d74a70f (patch) | |
| tree | eb783c62787e5f5dff2204b003762b67191a58f4 | |
| parent | 2e75a8c008b4ba0b5510d57e4a202124b3549a31 (diff) | |
| parent | 0cf2a52218fbb801a35e5dd73e146c6c37e218e2 (diff) | |
| download | nova-8ae129ace401a1493cd953d3f4b9ecc22d74a70f.tar.gz nova-8ae129ace401a1493cd953d3f4b9ecc22d74a70f.tar.xz nova-8ae129ace401a1493cd953d3f4b9ecc22d74a70f.zip | |
This branch fixes https://bugs.launchpad.net/bugs/751231.
In bug description, nova.compute.manager._poll_instance_states should ignore 'migrating' instances.
so I modified nova.compute.manager._poll_instance_states to do it.
| -rw-r--r-- | nova/compute/manager.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index bbc0e5f62..68b163355 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -1090,6 +1090,14 @@ class ComputeManager(manager.SchedulerDependentManager): vm_state = vm_instance.state vms_not_found_in_db.remove(name) + if db_instance['state_description'] == 'migrating': + # A situation which db record exists, but no instance" + # sometimes occurs while live-migration at src compute, + # this case should be ignored. + LOG.debug(_("Ignoring %(name)s, as it's currently being " + "migrated.") % locals()) + continue + if vm_state != db_state: LOG.info(_("DB/VM state mismatch. Changing state from " "'%(db_state)s' to '%(vm_state)s'") % locals()) |