openstack/manila
Code Issues Proposed changes

Merge "[netapp] remove last-transfer-size check for updating replica state"

Browse Source
This commit is contained in:
Zuul 2024-10-07 23:32:00 +00:00 committed by Gerrit Code Review
commit 98a5e8c7ac
3 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manila/share/drivers/netapp/dataontap/cluster_mode/lib_base.py
View File

@ -2886,15 +2886,6 @@ class NetAppCmodeFileStorageLibrary(object):
.isoformat(), (2 * self._snapmirror_schedule)))): .isoformat(), (2 * self._snapmirror_schedule)))):
return constants.REPLICA_STATE_OUT_OF_SYNC return constants.REPLICA_STATE_OUT_OF_SYNC
replica_backend = share_utils.extract_host(replica['host'],
level='backend_name')
config = data_motion.get_backend_configuration(replica_backend)
config_size = (int(config.safe_get(
'netapp_snapmirror_last_transfer_size_limit')) * units.Ki)
last_transfer_size = int(snapmirror.get('last-transfer-size', 0))
if last_transfer_size > config_size:
return constants.REPLICA_STATE_OUT_OF_SYNC
last_transfer_error = snapmirror.get('last-transfer-error', None) last_transfer_error = snapmirror.get('last-transfer-error', None)
if last_transfer_error: if last_transfer_error:
LOG.debug('Found last-transfer-error: %(error)s for replica: ' LOG.debug('Found last-transfer-error: %(error)s for replica: '

6
manila/share/drivers/netapp/options.py
View File

@ -250,12 +250,6 @@ netapp_data_motion_opts = [
'"destination" host will be the one that will be ' '"destination" host will be the one that will be '
'considered when creating a new replica, or promoting ' 'considered when creating a new replica, or promoting '
'a replica'), 'a replica'),
cfg.IntOpt('netapp_snapmirror_last_transfer_size_limit',
min=512,
default=1024, # One MB
help='This option set the last transfer size limit (in KB) '
'of snapmirror to decide whether replica is in sync or '
'out of sync.'),
cfg.IntOpt('netapp_volume_move_cutover_timeout', cfg.IntOpt('netapp_volume_move_cutover_timeout',
min=0, min=0,
default=3600, # One Hour, default=3600, # One Hour,

7
releasenotes/notes/netapp-remove-last-transfer-size-limit-check-ec66035ff30ad70b.yaml Normal file
View File

@ -0,0 +1,7 @@
---
upgrade:
- |
Removed the check for the last transfer size during updating replica state
in the ONTAP driver. Also removed the corresponding option
`netapp_snapmirror_last_transfer_size_limit`. See `launchpad bug 2066031
<https://bugs.launchpad.net/manila/+bug/2066031>`_ for more details.