mgr/nfs: nodeid should be numeric for RADOS_KV block in ganesha.conf file

Fixes: https://tracker.ceph.com/issues/69808
Signed-off-by: Shweta Bhosale <Shweta.Bhosale1@ibm.com>

diff --git a/src/pybind/mgr/cephadm/services/nfs.py b/src/pybind/mgr/cephadm/services/nfs.py
index 8b6ea752d5484e0793b2f9cdded63108b37687ba..5a0a24baf9370e848c41f089d30e0bb9eb0329b3 100644 (file)
--- a/src/pybind/mgr/cephadm/services/nfs.py
+++ b/src/pybind/mgr/cephadm/services/nfs.py
@@ -48,7 +48,7 @@ class NFSService(CephService):
                     if daemon_id is not None:
                         self.fence(daemon_id)
                 del rank_map[rank]
-                nodeid = f'{spec.service_name()}.{rank}'
+                nodeid = f'{rank}'
                 self.mgr.log.info(f'Removing {nodeid} from the ganesha grace table')
                 self.run_grace_tool(cast(NFSServiceSpec, spec), 'remove', nodeid)
                 self.mgr.spec_store.save_rank_map(spec.service_name(), rank_map)
@@ -82,7 +82,7 @@ class NFSService(CephService):
 
         deps: List[str] = []
 
-        nodeid = f'{daemon_spec.service_name}.{daemon_spec.rank}'
+        nodeid = f'{daemon_spec.rank}'
 
         nfs_idmap_conf = '/etc/ganesha/idmap.conf'
 

diff --git a/src/pybind/mgr/cephadm/templates/services/nfs/ganesha.conf.j2 b/src/pybind/mgr/cephadm/templates/services/nfs/ganesha.conf.j2
index b85ccd7b7fbadd8e20efb1336f3067ce7583cd67..b34715d3ceb2953fd6dc7a8054366211e6f249fd 100644 (file)
--- a/src/pybind/mgr/cephadm/templates/services/nfs/ganesha.conf.j2
+++ b/src/pybind/mgr/cephadm/templates/services/nfs/ganesha.conf.j2
@@ -26,7 +26,7 @@ NFSv4 {
 
 RADOS_KV {
         UserId = "{{ user }}";
-        nodeid = "{{ nodeid }}";
+        nodeid = {{ nodeid }};
         pool = "{{ pool }}";
         namespace = "{{ namespace }}";
 }

diff --git a/src/pybind/mgr/cephadm/tests/test_services.py b/src/pybind/mgr/cephadm/tests/test_services.py
index a1bbe87276bc9f8f4874f261537423dcd3d16c47..ed95d9c40af98321029a9516b1ebdc2353a11580 100644 (file)
--- a/src/pybind/mgr/cephadm/tests/test_services.py
+++ b/src/pybind/mgr/cephadm/tests/test_services.py
@@ -3256,7 +3256,7 @@ class TestIngressService:
             '\n'
             'RADOS_KV {\n'
             '        UserId = "nfs.foo.test.0.0";\n'
-            '        nodeid = "nfs.foo.None";\n'
+            '        nodeid = 0;\n'
             '        pool = ".nfs";\n'
             '        namespace = "foo";\n'
             '}\n'
@@ -3357,6 +3357,7 @@ class TestIngressService:
                 host='test',
                 daemon_id='foo.test.0.0',
                 service_name=nfs_service.service_name(),
+                rank=0,
             ),
         )
         assert nfs_generated_conf == nfs_expected_conf