openstack
/
cinder
Code Issues Proposed changes

Adds more validations in create_snapshot 

This patch adds more validations in create snapshot, like
host and replication. And removes the check logic
in create_snapshot_in_db method.

Change-Id: I8e5c7664e54116cc9e302e5e7903f4d7b04c836c
This commit is contained in:
Dongcan Ye 2018-06-25 04:36:07 +00:00
parent 01abd75a68
commit 12fab51ef7
1 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
cinder/volume/api.py
View File

@ -863,29 +863,9 @@ class API(base.Base):
cgsnapshot_id,
commit_quota=True,
group_snapshot_id=None):
context.authorize(snapshot_policy.CREATE_POLICY, target_obj=volume)
self._create_snapshot_in_db_validate(context, volume)
utils.check_metadata_properties(metadata)
if not volume.host:
msg = _("The snapshot cannot be created because volume has "
"not been scheduled to any host.")
raise exception.InvalidVolume(reason=msg)
if volume['status'] == 'maintenance':
LOG.info('Unable to create the snapshot for volume, '
'because it is in maintenance.', resource=volume)
msg = _("The snapshot cannot be created when the volume is in "
"maintenance mode.")
raise exception.InvalidVolume(reason=msg)
if self._is_volume_migrating(volume):
# Volume is migrating, wait until done
msg = _("Snapshot cannot be created while volume is migrating.")
raise exception.InvalidVolume(reason=msg)
if volume['status'].startswith('replica_'):
# Can't snapshot secondary replica
msg = _("Snapshot of secondary replica is not allowed.")
raise exception.InvalidVolume(reason=msg)
valid_status = ["available", "in-use"] if force else ["available"]
@ -996,6 +976,10 @@ class API(base.Base):
def _create_snapshot_in_db_validate(self, context, volume):
context.authorize(snapshot_policy.CREATE_POLICY, target_obj=volume)
if not volume.host:
msg = _("The snapshot cannot be created because volume has "
"not been scheduled to any host.")
raise exception.InvalidVolume(reason=msg)
if volume['status'] == 'maintenance':
LOG.info('Unable to create the snapshot for volume, '
'because it is in maintenance.', resource=volume)
@ -1011,6 +995,10 @@ class API(base.Base):
"in error status.")
LOG.error(msg)
raise exception.InvalidVolume(reason=msg)
if volume['status'].startswith('replica_'):
# Can't snapshot secondary replica
msg = _("Snapshot of secondary replica is not allowed.")
raise exception.InvalidVolume(reason=msg)
def _create_snapshots_in_db_reserve(self, context, volume_list):
reserve_opts_list = []