diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-09-13 05:36:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-09-13 05:36:31 +0000 |
| commit | ef8d6a57a166d20782d8ad284b2b72aa4ec48572 (patch) | |
| tree | 773871b4f956040caae705a3d3621be7f9895362 /nova/compute | |
| parent | e72db9fe9345c48f4ea287643306d884c82f04f4 (diff) | |
| parent | a3bdc1624fd557e0699acb049b1ca0c1ef894c2f (diff) | |
Merge "Avoid live migrate overwriting the other task_state"
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/api.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index 399ac6dd3..d9243a84b 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -1939,6 +1939,10 @@ class API(base.Base): LOG.debug(_("Going to try to live migrate instance to %s"), host, instance=instance) + instance = self.update(context, instance, + task_state=task_states.MIGRATING, + expected_task_state=None) + self.scheduler_rpcapi.live_migration(context, block_migration, disk_over_commit, instance, host) |