diff options
| author | MotoKen <motokentsai@gmail.com> | 2012-04-23 19:24:14 +0800 |
|---|---|---|
| committer | MotoKen <motokentsai@gmail.com> | 2012-04-24 12:56:13 +0800 |
| commit | 4bd4f756f107f94a264d8894203c00d10af322ee (patch) | |
| tree | 2df652ee90629233036c5447cb8d6e0f55f28d33 | |
| parent | b916b06f1059611a1f7ecfa6781e1d27036d053e (diff) | |
Removes unnecessary code in _run_instance.
* Remove _is_instance_terminated and _shutdown_instance_even_if_deleted
since run/terminate instance is synchronized.
* Avoid potential deadlock.
* Fixes bug 981316.
Change-Id: I4fe7e2ea00b85d9e0802fe93655e67db3909e86b
| -rw-r--r-- | nova/compute/manager.py | 36 |
1 files changed, 1 insertions, 35 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 6ade886a1..a6c05d50f 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -380,32 +380,6 @@ class ComputeManager(manager.SchedulerDependentManager): 'block_device_mapping': block_device_mapping } - def _is_instance_terminated(self, instance_uuid): - """Instance in DELETING task state or not found in DB""" - context = nova.context.get_admin_context() - try: - instance = self.db.instance_get_by_uuid(context, instance_uuid) - if instance['task_state'] == task_states.DELETING: - return True - return False - except Exception: - return True - - def _shutdown_instance_even_if_deleted(self, context, instance_uuid): - """Call terminate_instance even for already deleted instances""" - try: - try: - self.terminate_instance(context, instance_uuid) - except exception.InstanceNotFound: - LOG.info(_("Instance already deleted from database. " - "Attempting forceful vm deletion"), - instance_uuid=instance_uuid) - ctxt = nova.context.get_admin_context(read_deleted='yes') - self.terminate_instance(ctxt, instance_uuid) - except Exception as ex: - LOG.exception(_("Exception encountered while terminating the " - "instance"), instance_uuid=instance_uuid) - def _run_instance(self, context, instance_uuid, requested_networks=None, injected_files=[], @@ -438,16 +412,8 @@ class ComputeManager(manager.SchedulerDependentManager): self._notify_about_instance_usage( context, instance, "create.end", network_info=network_info) - - if self._is_instance_terminated(instance_uuid): - raise exception.InstanceNotFound except exception.InstanceNotFound: - LOG.exception(_("Instance not found."), - instance_uuid=instance_uuid) - # assuming the instance was already deleted, run "delete" again - # just in case - self._shutdown_instance_even_if_deleted(context, instance_uuid) - return + LOG.warn(_("Instance not found."), instance_uuid=instance_uuid) except Exception as e: with utils.save_and_reraise_exception(): self._set_instance_error_state(context, instance_uuid) |