diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-25 20:12:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-25 20:12:55 +0000 |
| commit | 2f97345472a8bafa17c425bccfb7b81b46b8d6d5 (patch) | |
| tree | 4d400630a804abc00d1e9586667cfac0516758c9 /nova/notifications.py | |
| parent | df47c6d27b40a77f74f87c83e27e7fff404165cf (diff) | |
| parent | e2f2d10e1a59a6688c6f9763fff0fd45578da5eb (diff) | |
| download | nova-2f97345472a8bafa17c425bccfb7b81b46b8d6d5.tar.gz nova-2f97345472a8bafa17c425bccfb7b81b46b8d6d5.tar.xz nova-2f97345472a8bafa17c425bccfb7b81b46b8d6d5.zip | |
Merge "Avoid db lookup in info_from_instance()."
Diffstat (limited to 'nova/notifications.py')
| -rw-r--r-- | nova/notifications.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/nova/notifications.py b/nova/notifications.py index f399ac55d..65428d03f 100644 --- a/nova/notifications.py +++ b/nova/notifications.py @@ -283,12 +283,8 @@ def info_from_instance(context, instance_ref, network_info, instance_type_name = instance_ref.get('instance_type', {}).get('name', '') if system_metadata is None: - try: - system_metadata = db.instance_system_metadata_get( - context, instance_ref['uuid']) - - except exception.NotFound: - system_metadata = {} + system_metadata = utils.metadata_to_dict( + instance_ref['system_metadata']) instance_info = dict( # Owner properties |