From dd13d5ae39e83890e528ebfc0f2459a434a9d689 Mon Sep 17 00:00:00 2001 From: Maurice Escher Date: Tue, 21 Feb 2023 12:44:50 +0100 Subject: [PATCH] NetApp: move split job to end Volumes may be busy during split operation, so other actions would fail, e.g. applying snapdir visibility, setting volume size .. Closes-Bug: #2007970 Change-Id: I3e36f77f4e46c90af8445601e10eadf9c55ed5f6 --- .../share/drivers/netapp/dataontap/cluster_mode/lib_base.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/manila/share/drivers/netapp/dataontap/cluster_mode/lib_base.py b/manila/share/drivers/netapp/dataontap/cluster_mode/lib_base.py index 0167fa84c1..ed54911e02 100644 --- a/manila/share/drivers/netapp/dataontap/cluster_mode/lib_base.py +++ b/manila/share/drivers/netapp/dataontap/cluster_mode/lib_base.py @@ -1564,8 +1564,6 @@ class NetAppCmodeFileStorageLibrary(object): share, vserver, vserver_client=vserver_client) hide_snapdir = provisioning_options.pop('hide_snapdir') - if split is not None: - provisioning_options['split'] = split LOG.debug('Creating share from snapshot %s', snapshot['id']) vserver_client.create_volume_clone( @@ -1588,6 +1586,10 @@ class NetAppCmodeFileStorageLibrary(object): self._create_fpolicy_for_share(share, vserver, vserver_client, **provisioning_options) + # split at the end: not be blocked by a busy volume + if split is not None: + vserver_client.split_volume_clone(share_name) + @na_utils.trace def _share_exists(self, share_name, vserver_client): return vserver_client.volume_exists(share_name)