Merge lp:~nttdata/nova/lp751231 into lp:~hudson-openstack/nova/trunk

[Kei Masumoto]

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.

[Devin Carlen (devcamcar)]

lgtm

review: Approve

[Brian Waldon (bcwaldon)]

I think the logging statement (lines 12-14) is off. "% locals()" should be moved out of the _(...)

review: Needs Fixing

[Kei Masumoto (masumotok)]

Hi, thanks for your review!
I just want to let you know I fixed patch based on your comments...

Kei

[Brian Waldon (bcwaldon)]

> Hi, thanks for your review!
> I just want to let you know I fixed patch based on your comments...
>
> Kei

Good work!

review: Approve

[Soren Hansen (soren)]

I don't think "info" is the correct log level for this message. This is something that is very likely to happen during migrations, so doesn't really warrant a message in anything but debug logs.

I also think we need to rephrase the log message. How about something like "Ignoring %(name)s, as it's currently being migrated."

review: Needs Fixing

[Kei Masumoto (masumotok)]

Thanks. Fixed it..

[Sandy Walsh (sandy-walsh)]

lgtm

review: Approve

=== modified file 'nova/compute/manager.py'
--- nova/compute/manager.py	2011-04-07 23:52:48 +0000
+++ nova/compute/manager.py	2011-04-08 18:40:04 +0000
@@ -1090,6 +1090,14 @@
                 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())