mgr/smb: use lazy_init to create the rados store

The rados store is created when the service is deployed.

Also fix a typo identified in _lazy_init()

Signed-off-by: Sachin Prabhu <sp@spui.uk>
(cherry picked from commit 4fc592eb64cce763f155d485330ea7cc342b3eb7)

Resolves: rhbz#2380412

Signed-off-by: Sachin Prabhu <sprabhu@redhat.com>

diff --git a/src/pybind/mgr/smb/clustermeta.py b/src/pybind/mgr/smb/clustermeta.py
index 72949c5d90579de8bc267abea76def6b32ed5644..dd412e0f3d85331780387fc3367dcefd2a3cbe46 100644 (file)
--- a/src/pybind/mgr/smb/clustermeta.py
+++ b/src/pybind/mgr/smb/clustermeta.py
@@ -179,7 +179,7 @@ _LOCK_NAME = "cluster_meta"
 def rados_object(mgr: 'MgrModule', uri: str) -> Iterator[ClusterMeta]:
     """Return a cluster meta object that will store persistent data in rados."""
     pool, ns, objname = rados_store.parse_uri(uri)
-    store = rados_store.RADOSConfigStore.init(mgr, pool)
+    store = rados_store.RADOSConfigStore.lazy_init(mgr, pool)
 
     cmeta = ClusterMeta()
     previous = {}

diff --git a/src/pybind/mgr/smb/module.py b/src/pybind/mgr/smb/module.py
index c5a7dd10f5e5f1d069924af9f74f28d7239459a5..b794042c8336377a895b8d7490a59c21db1b2249 100644 (file)
--- a/src/pybind/mgr/smb/module.py
+++ b/src/pybind/mgr/smb/module.py
@@ -72,7 +72,7 @@ class Module(orchestrator.OrchestratorClientMixin, MgrModule):
         self._priv_store = priv_store or mon_store.MonKeyConfigStore(self)
         # self._public_store = public_store or mon_store.MonKeyConfigStore(self)
         self._public_store = (
-            public_store or rados_store.RADOSConfigStore.init(self)
+            public_store or rados_store.RADOSConfigStore.lazy_init(self)
         )
         path_resolver = path_resolver or fs.CachingCephFSPathResolver(self)
         earmark_resolver = earmark_resolver or CephFSEarmarkResolver(self)

diff --git a/src/pybind/mgr/smb/rados_store.py b/src/pybind/mgr/smb/rados_store.py
index 9ac99645a65b58882fcaf88350ac1f524bd600f3..d3da535dbdb2eada03bd404d75e883e49af90adc 100644 (file)
--- a/src/pybind/mgr/smb/rados_store.py
+++ b/src/pybind/mgr/smb/rados_store.py
@@ -210,7 +210,7 @@ class RADOSConfigStore:
 
     def _lazy_init(self) -> None:
         if self._init_cb:
-            self._init_cb
+            self._init_cb()
             self._init_cb = None
 
     def __getitem__(self, key: EntryKey) -> RADOSConfigEntry: