From: Sage Weil <sage@redhat.com>
Date: Mon, 23 Dec 2019 19:47:29 +0000 (-0600)
Subject: mgr/cephadm: speed up when not refresh is needed
X-Git-Tag: v15.1.0~64^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c0060e2927d047e1dd6756dacdf070cde62fef49;p=ceph.git

mgr/cephadm: speed up when not refresh is needed

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 d452eb368570..0cb46ed67d36 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -1150,8 +1150,11 @@ class CephadmOrchestrator(MgrModule, orchestrator.OrchestratorClientMixin):
                     result.append(sd)
             return result
 
-        return self._refresh_host_services(wait_for_args).then(
-            _get_services_result)
+        if wait_for_args:
+            return self._refresh_host_services(wait_for_args).then(
+                _get_services_result)
+        else:
+            return trivial_result(_get_services_result({}))
 
     def describe_service(self, service_type=None, service_id=None,
                          node_name=None, refresh=False):