openstack/manila
Code Issues Proposed changes

Merge "fix volume resize issue when host not recognized"

Browse Source
This commit is contained in:
Zuul
2025-03-18 02:07:13 +00:00
committed by Gerrit Code Review
parent 23a72195bd 0ac0e43e0e
commit 32948b7135
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manila/share/drivers/helpers.py
View File

@@ -339,6 +339,8 @@ class NFSHelper(NASHelperBase):
items = line.split(' ')
if local_path == items[0]:
entries.append(items[1])
# exportfs may print"<world>" instead of "*" for host
entries = ["*" if item == "<world>" else item for item in entries]
return entries
def _sync_nfs_temp_and_perm_files(self, server):

5
manila/tests/share/drivers/test_helpers.py
View File

@@ -256,11 +256,12 @@ class NFSHelperTestCase(test.TestCase):
def test_get_host_list(self):
fake_exportfs = ('/shares/share-1\n\t\t20.0.0.3\n'
'/shares/share-1\n\t\t20.0.0.6\n'
'/shares/share-1\n\t\t<world>\n'
'/shares/share-2\n\t\t10.0.0.2\n'
'/shares/share-2\n\t\t10.0.0.5\n'
'/shares/share-3\n\t\t30.0.0.4\n'
'/shares/share-3\n\t\t30.0.0.7\n')
expected = ['20.0.0.3', '20.0.0.6']
expected = ['20.0.0.3', '20.0.0.6', '*']
result = self._helper.get_host_list(fake_exportfs, '/shares/share-1')
self.assertEqual(expected, result)
@@ -408,7 +409,7 @@ class NFSHelperTestCase(test.TestCase):
'"{}"'.format(':'.join(['1.1.1.16', local_path]))]),
mock.call(self.server,
['sudo', 'exportfs', '-u',
'"{}"'.format(':'.join(['<world>', local_path]))]),
'"{}"'.format(':'.join(['*', local_path]))]),
])
self._helper._sync_nfs_temp_and_perm_files.assert_called_once_with(

6
releasenotes/notes/fix-generic-driver-resize-0fde9c8674db5951.yaml Normal file
View File

@@ -0,0 +1,6 @@
---
fixes:
- |
For generic driver, when resize a share it may failed due to exportfs
can't recognize "<world>" as part of the share path. This issue has been
fixed by replacing "<world>" to "*".