openstack
/
cinder
Code Issues Proposed changes

Merge "Update and add notifiers in create volume"

This commit is contained in:
Jenkins 2013-06-15 06:36:18 +00:00 committed by Gerrit Code Review
parent 0e249f4b9a 3deebeeb50
commit b1b06e33b0
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/tests/test_volume.py
View File

@ -144,7 +144,7 @@ class VolumeTestCase(test.TestCase):
msg = test_notifier.NOTIFICATIONS[1]
self.assertEqual(msg['event_type'], 'volume.create.end')
expected = {
'status': 'creating',
'status': 'available',
'display_name': None,
'availability_zone': 'nova',
'tenant_id': 'fake',

12
cinder/volume/manager.py
View File

@ -287,9 +287,13 @@ class VolumeManager(manager.SchedulerDependentManager):
self.db.volume_update(context, volume_ref['id'], model_update)
except Exception:
with excutils.save_and_reraise_exception():
volume_ref['status'] = 'error'
self.db.volume_update(context,
volume_ref['id'], {'status': 'error'})
volume_ref['id'],
{'status': volume_ref['status']})
LOG.error(_("volume %s: create failed"), volume_ref['name'])
self._notify_about_volume_usage(context, volume_ref,
"create.end")
if snapshot_id:
# Copy any Glance metadata from the original volume
@ -315,9 +319,11 @@ class VolumeManager(manager.SchedulerDependentManager):
key, value)
now = timeutils.utcnow()
volume_ref['status'] = status
self.db.volume_update(context,
volume_ref['id'], {'status': status,
'launched_at': now})
volume_ref['id'],
{'status': volume_ref['status'],
'launched_at': now})
LOG.info(_("volume %s: created successfully"), volume_ref['name'])
self._reset_stats()