openstack/cinder
Code Issues Proposed changes

Merge "Use backup_use_temp_snapshot setting for default"

Browse Source
This commit is contained in:
Jenkins 2017-08-29 14:13:01 +00:00 committed by Gerrit Code Review
commit fa98ab3bcf
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cinder/volume/driver.py
View File

@ -258,9 +258,10 @@ volume_opts = [
'storage back-end.'),
cfg.BoolOpt('backup_use_temp_snapshot',
default=False,
help='If this is set to True, the backup_use_temp_snapshot '
'path will be used during the backup. Otherwise, it '
'will use backup_use_temp_volume path.'),
help='If this is set to True, a temporary snapshot will '
'be created for performing non-disruptive backups. '
'Otherwise a temporary volume will be cloned '
'in order to perform a backup.'),
cfg.BoolOpt('enable_unsupported_driver',
default=False,
help="Set this to True when you want to allow an unsupported "
@ -1093,7 +1094,14 @@ class BaseVD(object):
return None, False
def backup_use_temp_snapshot(self):
return False
"""Get the configured setting for backup from snapshot.
If an inheriting driver does not support this operation,
the driver should override this method to return false
and log a warning letting the administrator know they
have configured something that cannot be done.
"""
return self.configuration.safe_get("backup_use_temp_snapshot")
def snapshot_remote_attachable(self):
# TODO(lixiaoy1): the method will be deleted later when remote

4
cinder/volume/drivers/huawei/huawei_driver.py
View File

@ -1251,10 +1251,6 @@ class HuaweiBaseDriver(driver.VolumeDriver):
"""Remove an export for a snapshot."""
pass
def backup_use_temp_snapshot(self):
# This config option has a default to be False, So just return it.
return self.configuration.safe_get("backup_use_temp_snapshot")
def _copy_volume(self, volume, copy_name, src_lun, tgt_lun):
metadata = huawei_utils.get_volume_metadata(volume)
copyspeed = metadata.get('copyspeed')