diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-04-27 19:16:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-04-27 19:16:50 +0000 |
| commit | cd57400a21cabb3c10bb02184145fe4704859be2 (patch) | |
| tree | 224b68070933e0b2788b54bec403116bed8005ec /nova/compute | |
| parent | f041adaeaec7e746c9b78ae79bc196dfb80d8bfd (diff) | |
| parent | 7988fd139865b5399be58aea75b07436dc7c2f21 (diff) | |
Merge "Fix instance delete notifications."
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/manager.py | 5 | ||||
| -rw-r--r-- | nova/compute/utils.py | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 0366b4568..0023d702a 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -717,12 +717,11 @@ class ComputeManager(manager.SchedulerDependentManager): self._notify_about_instance_usage(context, instance, "delete.start") self._shutdown_instance(context, instance, 'Terminating') self._cleanup_volumes(context, instance_id) - self._instance_update(context, + instance = self._instance_update(context, instance_id, vm_state=vm_states.DELETED, task_state=None, terminated_at=utils.utcnow()) - self.db.instance_destroy(context, instance_id) self._notify_about_instance_usage(context, instance, "delete.end") @@ -735,8 +734,6 @@ class ComputeManager(manager.SchedulerDependentManager): def do_terminate_instance(): elevated = context.elevated() instance = self.db.instance_get_by_uuid(elevated, instance_uuid) - compute_utils.notify_usage_exists( - context, instance, current_period=True) try: self._delete_instance(context, instance) except exception.InstanceTerminationFailure as error: diff --git a/nova/compute/utils.py b/nova/compute/utils.py index df4a9d221..78a6e574c 100644 --- a/nova/compute/utils.py +++ b/nova/compute/utils.py @@ -208,7 +208,10 @@ def _usage_from_instance(context, instance_ref, network_info=None, **kw): disk_gb=instance_ref['root_gb'] + instance_ref['ephemeral_gb'], display_name=instance_ref['display_name'], created_at=str(instance_ref['created_at']), - deleted_at=null_safe_str(instance_ref['deleted_at']), + # Nova's deleted vs terminated instance terminology is confusing, + # this should be when the instance was deleted (i.e. terminated_at), + # not when the db record was deleted. (mdragon) + deleted_at=null_safe_str(instance_ref['terminated_at']), launched_at=null_safe_str(instance_ref['launched_at']), image_ref_url=image_ref_url, state=instance_ref['vm_state'], |