openstack/cinder
Code Issues Proposed changes

Merge "Remove the redundant volume/snapshot check"

Browse Source
This commit is contained in:
Jenkins 2017-06-22 00:21:19 +00:00 committed by Gerrit Code Review
commit f79f009f0c
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cinder/db/sqlalchemy/api.py
View File

@ -2711,7 +2711,6 @@ def _volume_image_metadata_get_query(context, volume_id, session=None):
@require_context @require_context
@require_volume_exists
def _volume_user_metadata_get(context, volume_id, session=None): def _volume_user_metadata_get(context, volume_id, session=None):
return _volume_x_metadata_get(context, volume_id, return _volume_x_metadata_get(context, volume_id,
models.VolumeMetadata, session=session) models.VolumeMetadata, session=session)
@ -2783,7 +2782,6 @@ def volume_metadata_delete(context, volume_id, key, meta_type):
@require_context @require_context
@require_volume_exists
@handle_db_data_error @handle_db_data_error
@_retry_on_deadlock @_retry_on_deadlock
def volume_metadata_update(context, volume_id, metadata, delete, meta_type): def volume_metadata_update(context, volume_id, metadata, delete, meta_type):
@ -4765,7 +4763,6 @@ def _volume_glance_metadata_get(context, volume_id, session=None):
@require_context @require_context
@require_volume_exists
def volume_glance_metadata_get(context, volume_id): def volume_glance_metadata_get(context, volume_id):
"""Return the Glance metadata for the specified volume.""" """Return the Glance metadata for the specified volume."""
@ -4787,7 +4784,6 @@ def _volume_snapshot_glance_metadata_get(context, snapshot_id, session=None):
@require_context @require_context
@require_snapshot_exists
def volume_snapshot_glance_metadata_get(context, snapshot_id): def volume_snapshot_glance_metadata_get(context, snapshot_id):
"""Return the Glance metadata for the specified snapshot.""" """Return the Glance metadata for the specified snapshot."""
@ -4875,7 +4871,6 @@ def volume_glance_metadata_copy_to_snapshot(context, snapshot_id, volume_id):
@require_context @require_context
@require_volume_exists
def volume_glance_metadata_copy_from_volume_to_volume(context, def volume_glance_metadata_copy_from_volume_to_volume(context,
src_volume_id, src_volume_id,
volume_id): volume_id):