diff options
| author | Johannes Erdfelt <johannes.erdfelt@rackspace.com> | 2011-09-07 23:03:18 +0000 |
|---|---|---|
| committer | Johannes Erdfelt <johannes.erdfelt@rackspace.com> | 2011-09-07 23:03:18 +0000 |
| commit | da40f02dc7ef4e568ef872628402f11f666e3e2b (patch) | |
| tree | 9217ff9a4e9e8c9e771db62b42430cdcdb65fb5a | |
| parent | 4968aade5ce77d1068a014baf5d520b94fd668dc (diff) | |
Check task_state for queued delete
| -rw-r--r-- | nova/compute/api.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/nova/compute/api.py b/nova/compute/api.py index 6ff8d96a1..99166b0af 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -92,13 +92,14 @@ def _is_able_to_shutdown(instance, instance_id): return True -def _is_delete_queued(instance, instance_id): +def _is_queued_delete(instance, instance_id): vm_state = instance["vm_state"] task_state = instance["task_state"] - if vm_state != vm_states.DELETED: - LOG.warn(_("Instance %(instance_id)s is not in a 'deleted' state. It " - "is currently %(vm_state)s. Action aborted.") % locals()) + if task_state != task_states.QUEUED_DELETE: + LOG.warn(_("Instance %(instance_id)s is not in a 'queued deleted' " + "state. It is currently %(task_state)s. Action aborted.") % + locals()) return False return True @@ -798,7 +799,7 @@ class API(base.Base): """Restore a previously deleted (but not reclaimed) instance.""" instance = self._get_instance(context, instance_id, 'restore') - if not _is_delete_queued(instance, instance_id): + if not _is_queued_delete(instance, instance_id): return self.update(context, @@ -818,7 +819,7 @@ class API(base.Base): """Force delete a previously deleted (but not reclaimed) instance.""" instance = self._get_instance(context, instance_id, 'force delete') - if not _is_delete_queued(instance, instance_id): + if not _is_queued_delete(instance, instance_id): return self.update(context, |