From c605c907006934c5348ef592b8b791df68814dd4 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 17 Feb 2020 07:54:06 -0600 Subject: [PATCH] mgr/cephadm: move cutoff calc inside helper Signed-off-by: Sage Weil --- src/pybind/mgr/cephadm/module.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py index 35f6a8fbda1..cf7fe8da1ce 100644 --- a/src/pybind/mgr/cephadm/module.py +++ b/src/pybind/mgr/cephadm/module.py @@ -203,8 +203,10 @@ class DaemonCache(): r.append(name) return r - def host_needs_refresh(self, host, cutoff): - # type: (str, datetime.datetime) -> bool + def host_needs_refresh(self, host): + # type: (str) -> bool + cutoff = datetime.datetime.utcnow() - datetime.timedelta( + seconds=self.mgr.daemon_cache_timeout) if host not in self.last_update or self.last_update[host] < cutoff: return True return False @@ -860,12 +862,10 @@ class CephadmOrchestrator(MgrModule, orchestrator.OrchestratorClientMixin): self._check_hosts() # refresh daemons - cutoff = datetime.datetime.utcnow() - datetime.timedelta( - seconds=self.daemon_cache_timeout) - self.log.debug('refreshing daemons, cutoff %s' % cutoff) + self.log.debug('refreshing daemons') failures = [] for host in self.daemon_cache.get_hosts(): - if self.daemon_cache.host_needs_refresh(host, cutoff): + if self.daemon_cache.host_needs_refresh(host): self.log.debug('refreshing %s' % host) r = self._refresh_host_daemons(host) if r: -- 2.39.5