commit 1469c8e14267e27ecc6ced29c91dc1506ce26633
Author: David McNally <email address hidden>
Date: Fri May 16 13:21:26 2014 +0100
Prevent clean-up of migrating instances on compute init
During compute manager startup init_host is called. One
of the functions this carries out is to delete instance
data that doesn't belong to this host this function only
checks if the local instance belongs to the host or not.
It doesn't check the task_state. This could result in the
loss of all instance data if it occured at the wrong
point during live migration.
This change checks if the task_state of the instance to
be deleted is MIGRATING and if so it does not delete the
instance. Similarily for the task state RESIZE_MIGRATING.
This change adjust little about the unit test according to
actual code path in icehouse.
Conflicts:
nova/tests/compute/test_compute_mgr.py
Change-Id: Ia8c67acf93d71af868907f0711dcc1dfe103560c
Closes-Bug: 1319797
(cherry picked from commit 340cae5466eaf5568c4f0eecb2a2fa7cdbcc0ba4)
Reviewed: https:/ /review. openstack. org/101832 /git.openstack. org/cgit/ openstack/ nova/commit/ ?id=1469c8e1426 7e27ecc6ced29c9 1dc1506ce26633
Committed: https:/
Submitter: Jenkins
Branch: stable/icehouse
commit 1469c8e14267e27 ecc6ced29c91dc1 506ce26633
Author: David McNally <email address hidden>
Date: Fri May 16 13:21:26 2014 +0100
Prevent clean-up of migrating instances on compute init
During compute manager startup init_host is called. One
of the functions this carries out is to delete instance
data that doesn't belong to this host this function only
checks if the local instance belongs to the host or not.
It doesn't check the task_state. This could result in the
loss of all instance data if it occured at the wrong
point during live migration.
This change checks if the task_state of the instance to
be deleted is MIGRATING and if so it does not delete the
instance. Similarily for the task state RESIZE_MIGRATING.
This change adjust little about the unit test according to tests/compute/ test_compute_ mgr.py
actual code path in icehouse.
Conflicts:
nova/
Change-Id: Ia8c67acf93d71a f868907f0711dcc 1dfe103560c 68c4f0eecb2a2fa 7cdbcc0ba4)
Closes-Bug: 1319797
(cherry picked from commit 340cae5466eaf55