commit 6f0fecbed3a72ce052662a6bc6441d6aac6b9d1f
Author: Kevin L. Mitchell <email address hidden>
Date: Wed Jul 25 17:27:57 2012 -0500
Allow soft deletes from any state
At some point in the past, the compute manager's delete() method had
its @check_instance_state() decorator updated to allow deletes to be
performed from any combination of vm_state and task_state. This same
change was not made to the soft_delete() method, and so soft_delete()
is only available if the task_state is clear, meaning that instances
that are put into ERROR state with task_state set to something are
effectively undeletable, if FLAGS.reclaim_instance_interval is set to
some non-zero value (which is what causes the API DELETE call to use
soft_delete() as opposed to delete()). This patch updates the
@check_instance_state() on soft_delete() to match that on delete(),
and fixes bug 1029130 and bug 1029133. This patch also partially
fixes bug 1029132, but more needs to be done to completely fix that
bug.
Reviewed: https:/ /review. openstack. org/10302 github. com/openstack/ nova/commit/ 6f0fecbed3a72ce 052662a6bc6441d 6aac6b9d1f
Committed: http://
Submitter: Jenkins
Branch: master
commit 6f0fecbed3a72ce 052662a6bc6441d 6aac6b9d1f
Author: Kevin L. Mitchell <email address hidden>
Date: Wed Jul 25 17:27:57 2012 -0500
Allow soft deletes from any state
At some point in the past, the compute manager's delete() method had instance_ state() decorator updated to allow deletes to be instance_ interval is set to instance_ state() on soft_delete() to match that on delete(),
its @check_
performed from any combination of vm_state and task_state. This same
change was not made to the soft_delete() method, and so soft_delete()
is only available if the task_state is clear, meaning that instances
that are put into ERROR state with task_state set to something are
effectively undeletable, if FLAGS.reclaim_
some non-zero value (which is what causes the API DELETE call to use
soft_delete() as opposed to delete()). This patch updates the
@check_
and fixes bug 1029130 and bug 1029133. This patch also partially
fixes bug 1029132, but more needs to be done to completely fix that
bug.
Change-Id: I78878110c69628 0f2bc2843443381 4884a526264