mgr/cephadm: by default, return current service state

In the normal case, return whatever state we currently have.

In the serve loop, refresh if the state is old.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 4784ec2fbe9353f2bcb6deed416f2099119050a1..27854c8887dbd3661e9850e7614da65ccb56eb1c 100644 (file)
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -692,7 +692,7 @@ class CephadmOrchestrator(MgrModule, orchestrator.OrchestratorClientMixin):
 
             # refresh services
             self.log.debug('refreshing services')
-            completion = self._get_services(refresh=True)
+            completion = self._get_services(maybe_refresh=True)
             self._orchestrator_wait([completion])
             orchestrator.raise_if_exception(completion)
             services = completion.result
@@ -1168,7 +1168,8 @@ class CephadmOrchestrator(MgrModule, orchestrator.OrchestratorClientMixin):
                       service_name=None,
                       service_id=None,
                       node_name=None,
-                      refresh=False):
+                      refresh=False,
+                      maybe_refresh=False):
         hosts = []
         wait_for_args = []
         services = {}
@@ -1177,9 +1178,22 @@ class CephadmOrchestrator(MgrModule, orchestrator.OrchestratorClientMixin):
             keys = [node_name]
         for host, host_info in self.service_cache.items_filtered(keys):
             hosts.append(host)
-            if host_info.outdated(self.service_cache_timeout) or refresh:
+            if refresh:
+                self.log.info("refreshing services for '{}'".format(host))
+                wait_for_args.append((host,))
+            elif maybe_refresh and host_info.outdated(self.service_cache_timeout):  # type: ignore
                 self.log.info("refreshing stale services for '{}'".format(host))
                 wait_for_args.append((host,))
+            elif not host_info.last_refresh:
+                services[host] = [
+                    {
+                        'name': '*',
+                        'service_type': '*',
+                        'service_instance': '*',
+                        'style': 'cephadm',
+                        'fsid': self._cluster_fsid,
+                    },
+                ]
             else:
                 self.log.debug('have recent services for %s: %s' % (
                     host, host_info.data))
@@ -1200,14 +1214,15 @@ class CephadmOrchestrator(MgrModule, orchestrator.OrchestratorClientMixin):
                         continue
                     self.log.debug('including %s %s' % (host, d))
                     sd = orchestrator.ServiceDescription()
-                    sd.last_refresh = datetime.datetime.strptime(
-                        d.get('last_refresh'), DATEFMT)
+                    if 'last_refresh' in d:
+                        sd.last_refresh = datetime.datetime.strptime(
+                            d['last_refresh'], DATEFMT)
                     sd.service_type = d['name'].split('.')[0]
                     if service_type and service_type != sd.service_type:
                         continue
                     if '.' in d['name']:
                         sd.service_instance = '.'.join(d['name'].split('.')[1:])
-                    else:
+                    elif d['name'] != '*':
                         sd.service_instance = host  # e.g., crash
                     if service_id and service_id != sd.service_instance:
                         continue

diff --git a/src/pybind/mgr/cephadm/tests/test_cephadm.py b/src/pybind/mgr/cephadm/tests/test_cephadm.py
index d45c7addd2c69d31e6093e223203865b01007a2b..2f20230841565535ac3d5ab4a63f8b37eba32a83 100644 (file)
--- a/src/pybind/mgr/cephadm/tests/test_cephadm.py
+++ b/src/pybind/mgr/cephadm/tests/test_cephadm.py
@@ -60,7 +60,7 @@ class TestCephadm(object):
     @mock.patch("cephadm.module.CephadmOrchestrator._run_cephadm", _run_cephadm('[]'))
     def test_service_ls(self, cephadm_module):
         with self._with_host(cephadm_module, 'test'):
-            c = cephadm_module.describe_service()
+            c = cephadm_module.describe_service(refresh=True)
             assert wait(cephadm_module, c) == []
 
     @mock.patch("cephadm.module.CephadmOrchestrator._run_cephadm", _run_cephadm('[]'))