openstack/manila
Code Issues Proposed changes

[netapp] Allow share server migration with replicas

Browse Source 
New share server property `share_replicas_migration_support` will be set
by backend driver and then evaluated in api layer to allow/dis-allow share
server migration with replicas.

Closes-bug: #2052785
Change-Id: I1cc5489488f44cc7edc7348fb3b3af7397564682
Depends-On: https://review.opendev.org/c/openstack/manila-tempest-plugin/+/935355
This commit is contained in:
Kiran Pawar 2024-11-01 07:33:34 +00:00
parent 814e76dc53
commit c9fa6f939c
20 changed files with 119 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
manila/db/migrations/alembic/versions/0d8c8f6d54a4_modify_share_servers_table.py Normal file
View File

@ -0,0 +1,55 @@
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
"""modify_share_servers_table
Revision ID: 0d8c8f6d54a4
Revises: cdefa6287df8
Create Date: 2024-11-15 09:25:25.957286
"""
# revision identifiers, used by Alembic.
revision = '0d8c8f6d54a4'
down_revision = 'cdefa6287df8'
from alembic import op
from oslo_log import log
import sqlalchemy as sa
SHARE_SERVERS_TABLE = 'share_servers'
LOG = log.getLogger(__name__)
def upgrade():
# add a new column to share_servers.
try:
op.add_column(
SHARE_SERVERS_TABLE,
sa.Column('share_replicas_migration_support', sa.Boolean,
nullable=False, server_default=sa.sql.false()))
except Exception:
LOG.error("Table %s could not add column "
"'share_replicas_migration_support'.",
SHARE_SERVERS_TABLE)
raise
def downgrade():
try:
op.drop_column(SHARE_SERVERS_TABLE,
'share_replicas_migration_support')
except Exception:
LOG.error("Table %s failed to drop the column "
"'share_replicas_migration_support'.", SHARE_SERVERS_TABLE)
raise

2
manila/db/sqlalchemy/models.py
View File

@ -1120,6 +1120,8 @@ class ShareServer(BASE, ManilaBase):
Boolean, nullable=False, default=False)
network_allocation_update_support = Column(
Boolean, nullable=False, default=False)
share_replicas_migration_support = Column(
Boolean, nullable=False, default=False)
status = Column(Enum(
constants.STATUS_INACTIVE, constants.STATUS_ACTIVE,
constants.STATUS_ERROR, constants.STATUS_DELETING,

9
manila/scheduler/host_manager.py
View File

@ -160,6 +160,7 @@ class HostState(object):
self.network_allocation_update_support = False
self.share_server_multiple_subnet_support = False
self.mount_point_name_support = False
self.share_replicas_migration_support = False
# PoolState for all pools
self.pools = {}
@ -365,6 +366,10 @@ class HostState(object):
pool_cap['share_server_multiple_subnet_support'] = (
self.share_server_multiple_subnet_support)
if 'share_replicas_migration_support' not in pool_cap:
pool_cap['share_replicas_migration_support'] = (
self.share_replicas_migration_support)
if self.ipv4_support is not None:
pool_cap['ipv4_support'] = self.ipv4_support
@ -400,6 +405,8 @@ class HostState(object):
'network_allocation_update_support', False)
self.share_server_multiple_subnet_support = capability.get(
'share_server_multiple_subnet_support', False)
self.share_replicas_migration_support = capability.get(
'share_replicas_migration_support', False)
def consume_from_share(self, share):
"""Incrementally update host state from an share."""
@ -506,6 +513,8 @@ class PoolState(HostState):
'network_allocation_update_support', False)
self.share_server_multiple_subnet_support = capability.get(
'share_server_multiple_subnet_support', False)
self.share_replicas_migration_support = capability.get(
'share_replicas_migration_support', False)
def update_pools(self, capability):
# Do nothing, since we don't have pools within pool, yet

4
manila/scheduler/utils.py
View File

@ -68,7 +68,9 @@ def generate_stats(host_state, properties):
'share_server_multiple_subnet_support': (
host_state.share_server_multiple_subnet_support),
'mount_point_name_support': (
host_state.mount_point_name_support)
host_state.mount_point_name_support),
'share_replicas_migration_support': (
host_state.share_replicas_migration_support),
}
host_caps = host_state.capabilities

4
manila/share/api.py
View File

@ -3090,7 +3090,9 @@ class API(base.Base):
'share_status': share['status']}
raise exception.InvalidShareServer(reason=msg)
if share.has_replicas:
if (not share_server.get(
'share_replicas_migration_support', False) and
share.has_replicas):
msg = _('Share %s has replicas. Remove the replicas of all '
'shares in the share server before attempting to '
'migrate it.') % share['id']

3
manila/share/driver.py
View File

@ -292,6 +292,7 @@ class ShareDriver(object):
# property will be saved in every new share server.
self.network_allocation_update_support = False
self.dhss_mandatory_security_service_association = {}
self.share_replicas_migration_support = False
self.pools = []
if self.configuration:
@ -1357,6 +1358,8 @@ class ShareDriver(object):
self.network_allocation_update_support),
share_server_multiple_subnet_support=False,
mount_point_name_support=False,
share_replicas_migration_support=(
self.share_replicas_migration_support),
)
if isinstance(data, dict):
common.update(data)

1
manila/share/drivers/netapp/dataontap/cluster_mode/drv_multi_svm.py
View File

@ -45,6 +45,7 @@ class NetAppCmodeMultiSvmShareDriver(driver.ShareDriver):
# NetApp driver supports multiple subnets including update existing
# share servers.
self.network_allocation_update_support = True
self.share_replicas_migration_support = True
def do_setup(self, context):
self.library.do_setup(context)

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

@ -571,6 +571,7 @@ class NetAppCmodeFileStorageLibrary(object):
'security_service_update_support': True,
'share_server_multiple_subnet_support': True,
'mount_point_name_support': True,
'share_replicas_migration_support': True,
}
# Add storage service catalog data.

10
manila/share/manager.py
View File

@ -811,6 +811,8 @@ class ShareManager(manager.SchedulerDependentManager):
self.driver.security_service_update_support),
'network_allocation_update_support': (
self.driver.network_allocation_update_support),
'share_replicas_migration_support': (
self.driver.share_replicas_migration_support),
}
)
@ -901,6 +903,8 @@ class ShareManager(manager.SchedulerDependentManager):
self.driver.security_service_update_support),
'network_allocation_update_support': (
self.driver.network_allocation_update_support),
'share_replicas_migration_support': (
self.driver.share_replicas_migration_support),
}
)
@ -1088,6 +1092,8 @@ class ShareManager(manager.SchedulerDependentManager):
self.driver.security_service_update_support),
'network_allocation_update_support': (
self.driver.network_allocation_update_support),
'share_replicas_migration_support': (
self.driver.share_replicas_migration_support),
}
)
@ -3389,7 +3395,9 @@ class ShareManager(manager.SchedulerDependentManager):
{'status': constants.STATUS_ACTIVE,
'identifier': new_identifier,
'network_allocation_update_support': (
self.driver.network_allocation_update_support)})
self.driver.network_allocation_update_support),
'share_replicas_migration_support': (
self.driver.share_replicas_migration_support)})
except Exception:
msg = "Error managing share server %s"

11
manila/tests/scheduler/test_host_manager.py
View File

@ -218,6 +218,7 @@ class HostManagerTestCase(test.TestCase):
'network_allocation_update_support': False,
'share_server_multiple_subnet_support': False,
'mount_point_name_support': False,
'share_replicas_migration_support': False
},
}, {
'name': 'host2@back1#BBB',
@ -252,6 +253,7 @@ class HostManagerTestCase(test.TestCase):
'network_allocation_update_support': False,
'share_server_multiple_subnet_support': False,
'mount_point_name_support': False,
'share_replicas_migration_support': False
},
}, {
'name': 'host2@back2#CCC',
@ -286,6 +288,7 @@ class HostManagerTestCase(test.TestCase):
'network_allocation_update_support': False,
'share_server_multiple_subnet_support': False,
'mount_point_name_support': False,
'share_replicas_migration_support': False
},
},
]
@ -342,6 +345,7 @@ class HostManagerTestCase(test.TestCase):
'network_allocation_update_support': False,
'share_server_multiple_subnet_support': False,
'mount_point_name_support': False,
'share_replicas_migration_support': False
},
}, {
'name': 'host2@BBB#pool2',
@ -377,6 +381,7 @@ class HostManagerTestCase(test.TestCase):
'network_allocation_update_support': False,
'share_server_multiple_subnet_support': False,
'mount_point_name_support': False,
'share_replicas_migration_support': False
},
}, {
'name': 'host3@CCC#pool3',
@ -412,6 +417,7 @@ class HostManagerTestCase(test.TestCase):
'network_allocation_update_support': False,
'share_server_multiple_subnet_support': False,
'mount_point_name_support': False,
'share_replicas_migration_support': False
},
}, {
'name': 'host4@DDD#pool4a',
@ -447,6 +453,7 @@ class HostManagerTestCase(test.TestCase):
'network_allocation_update_support': False,
'share_server_multiple_subnet_support': False,
'mount_point_name_support': False,
'share_replicas_migration_support': False
},
}, {
'name': 'host4@DDD#pool4b',
@ -482,6 +489,7 @@ class HostManagerTestCase(test.TestCase):
'network_allocation_update_support': False,
'share_server_multiple_subnet_support': False,
'mount_point_name_support': False,
'share_replicas_migration_support': False
},
},
]
@ -550,6 +558,7 @@ class HostManagerTestCase(test.TestCase):
'network_allocation_update_support': False,
'share_server_multiple_subnet_support': False,
'mount_point_name_support': False,
'share_replicas_migration_support': False
},
}, {
'name': 'host2@back1#BBB',
@ -584,6 +593,7 @@ class HostManagerTestCase(test.TestCase):
'network_allocation_update_support': False,
'share_server_multiple_subnet_support': False,
'mount_point_name_support': False,
'share_replicas_migration_support': False
},
},
]
@ -646,6 +656,7 @@ class HostManagerTestCase(test.TestCase):
'network_allocation_update_support': False,
'share_server_multiple_subnet_support': False,
'mount_point_name_support': False,
'share_replicas_migration_support': False,
},
},
]

1
manila/tests/share/drivers/dell_emc/test_driver.py
View File

@ -176,6 +176,7 @@ class EMCShareFrameworkTestCase(test.TestCase):
data['security_service_update_support'] = False
data['share_server_multiple_subnet_support'] = False
data['network_allocation_update_support'] = False
data['share_replicas_migration_support'] = False
self.assertEqual(data, self.driver._stats)
def _fake_safe_get(self, value):

1
manila/tests/share/drivers/dummy.py
View File

@ -147,6 +147,7 @@ class DummyDriver(driver.ShareDriver):
self.migration_progress = {}
self.security_service_update_support = True
self.network_allocation_update_support = True
self.share_replicas_migration_support = True
def _verify_configuration(self):
allowed_driver_methods = [m for m in dir(self) if m[0] != '_']

1
manila/tests/share/drivers/glusterfs/test_glusterfs_native.py
View File

@ -274,6 +274,7 @@ class GlusterfsNativeShareDriverTestCase(test.TestCase):
'security_service_update_support': False,
'share_server_multiple_subnet_support': False,
'network_allocation_update_support': False,
'share_replicas_migration_support': False,
}
self.assertEqual(test_data, self._driver._stats)

3
manila/tests/share/drivers/hpe/test_hpe_3par_driver.py
View File

@ -754,6 +754,7 @@ class HPE3ParDriverTestCase(test.TestCase):
'security_service_update_support': False,
'share_server_multiple_subnet_support': False,
'network_allocation_update_support': False,
'share_replicas_migration_support': False,
}
result = self.driver.get_share_stats(refresh=True)
@ -834,6 +835,7 @@ class HPE3ParDriverTestCase(test.TestCase):
'share_server_multiple_subnet_support': False,
'network_allocation_update_support': False,
'mount_snapshot_support': False,
'share_replicas_migration_support': False,
'share_group_stats': {
'consistent_snapshot_support': None,
},
@ -885,6 +887,7 @@ class HPE3ParDriverTestCase(test.TestCase):
'security_service_update_support': False,
'share_server_multiple_subnet_support': False,
'network_allocation_update_support': False,
'share_replicas_migration_support': False,
'mount_snapshot_support': False,
'share_group_stats': {
'consistent_snapshot_support': None,

1
manila/tests/share/drivers/huawei/test_huawei_nas.py
View File

@ -2439,6 +2439,7 @@ class HuaweiShareDriverTestCase(test.TestCase):
"security_service_update_support": False,
"share_server_multiple_subnet_support": False,
"network_allocation_update_support": False,
"share_replicas_migration_support": False,
}
if replication_support:

4
manila/tests/share/drivers/netapp/dataontap/fakes.py
View File

@ -1081,6 +1081,7 @@ POOLS = [
'netapp_flexgroup': False,
'netapp_cluster_name': 'fake_cluster_name',
'netapp_snaplock_type': 'compliance',
'share_replicas_migration_support': True,
},
{
'pool_name': AGGREGATES[1],
@ -1111,6 +1112,7 @@ POOLS = [
'netapp_flexgroup': False,
'netapp_cluster_name': 'fake_cluster_name',
'netapp_snaplock_type': 'compliance',
'share_replicas_migration_support': True
},
]
@ -1141,6 +1143,7 @@ POOLS_VSERVER_CREDS = [
'security_service_update_support': True,
'share_server_multiple_subnet_support': True,
'netapp_flexgroup': False,
'share_replicas_migration_support': True
},
{
'pool_name': AGGREGATES[1],
@ -1164,6 +1167,7 @@ POOLS_VSERVER_CREDS = [
'security_service_update_support': True,
'share_server_multiple_subnet_support': True,
'netapp_flexgroup': False,
'share_replicas_migration_support': True
},
]

1
manila/tests/share/drivers/veritas/test_veritas_isa.py
View File

@ -451,6 +451,7 @@ class ACCESSShareDriverTestCase(test.TestCase):
'security_service_update_support': False,
'share_server_multiple_subnet_support': False,
'network_allocation_update_support': False,
'share_replicas_migration_support': False,
}
self.assertEqual(data, self._driver._stats)

1
manila/tests/share/drivers/zfsonlinux/test_driver.py
View File

@ -382,6 +382,7 @@ class ZFSonLinuxShareDriverTestCase(test.TestCase):
'security_service_update_support': False,
'share_server_multiple_subnet_support': False,
'network_allocation_update_support': False,
'share_replicas_migration_support': False,
}
if replication_domain:
expected['replication_type'] = 'readable'

4
manila/tests/share/test_manager.py
View File

@ -3469,6 +3469,7 @@ class ShareManagerTestCase(test.TestCase):
'status': constants.STATUS_CREATING,
'security_service_update_support': False,
'network_allocation_update_support': False,
'share_replicas_migration_support': False,
}
fake_metadata = {
'migration_destination': True,
@ -7421,7 +7422,8 @@ class ShareManagerTestCase(test.TestCase):
utils.IsAMatcher(context.RequestContext), fake_share_server['id'],
{'status': constants.STATUS_ACTIVE,
'identifier': driver_return[0] or share_server['id'],
'network_allocation_update_support': False}
'network_allocation_update_support': False,
'share_replicas_migration_support': False}
)
mock_set_backend_details.assert_called_once_with(
utils.IsAMatcher(context.RequestContext), share_server['id'],

6
releasenotes/notes/bug-2052785-netapp-allow-share-server-migration-with-replicas-971fece378440aba.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
Netapp ONTAP driver now allows migration of share server even if one or
more shares on share server has replicas. For more details, please check
`Launchpad bug #2052785 <https://bugs.launchpad.net/manila/+bug/2052785>`_