openstack/manila
Code Issues Proposed changes

Set configured_ip_versions fact in cephfs driver

Browse Source 
Without it, we lose the memoization optimization
in the "get_configured_ip_versions" method, and
cause a warning log to be emitted one too many
times than desired.

Change-Id: Ibd05406b4af7c99795f1bca2d4989790430b616b
Closes-Bug: #1991776
Signed-off-by: Goutham Pacha Ravi <gouthampravi@gmail.com>
This commit is contained in:
Goutham Pacha Ravi 2022-10-11 13:49:55 -07:00
parent b8fdf9b9e7
commit bdfafcdada
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manila/share/drivers/cephfs/driver.py
View File

@ -1033,7 +1033,7 @@ class NFSProtocolHelperMixin():
"a hostname (rather than IP address) was supplied " "a hostname (rather than IP address) was supplied "
"in 'cephfs_ganesha_server_ip' or " "in 'cephfs_ganesha_server_ip' or "
"in 'cephfs_ganesha_export_ips'.") "in 'cephfs_ganesha_export_ips'.")
return [4, 6] self.configured_ip_versions = {4, 6}
return list(self.configured_ip_versions) return list(self.configured_ip_versions)

2
manila/tests/share/drivers/cephfs/test_driver.py
View File

@ -1115,6 +1115,8 @@ class NFSProtocolHelperTestCase(test.TestCase):
self.assertEqual(set(configured_ip_version), self.assertEqual(set(configured_ip_version),
set(helper.get_configured_ip_versions())) set(helper.get_configured_ip_versions()))
self.assertEqual(set(configured_ip_version),
helper.configured_ip_versions)
def test_get_configured_ip_versions_already_set(self): def test_get_configured_ip_versions_already_set(self):
fake_conf = configuration.Configuration(None) fake_conf = configuration.Configuration(None)

6
releasenotes/notes/bug-1991776-cephfs-configured-ip-versions-fd87976fdb848e8c.yaml Normal file
View File

@ -0,0 +1,6 @@
---
fixes:
- |
`Bug 1991776 <https://launchpad.net/bugs/1991776>`_ was fixed within the
CephFS driver. The driver no longer emits repeated warnings concerning
supported IP versions when using the NFS protocol.