]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/cephadm: use datetime_now() for last_facts_update
authorSage Weil <sage@newdream.net>
Tue, 2 Feb 2021 23:07:36 +0000 (17:07 -0600)
committerMichael Fritch <mfritch@suse.com>
Mon, 13 Jun 2022 16:30:41 +0000 (10:30 -0600)
Be consistent!

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 821f7e9d5b5a2d4725c5cea2987e601e07e83558)

src/pybind/mgr/cephadm/inventory.py

index 2409c89cbbdaa71322d143f06ec59a2027abd433..8e21c09879de04f1ed0fba4600de923a285b6cf9 100644 (file)
@@ -296,7 +296,7 @@ class HostCache():
     def update_host_facts(self, host, facts):
         # type: (str, Dict[str, Dict[str, Any]]) -> None
         self.facts[host] = facts
-        self.last_facts_update[host] = datetime.datetime.utcnow()
+        self.last_facts_update[host] = datetime_now()
 
     def devices_changed(self, host: str, b: List[inventory.Device]) -> bool:
         a = self.devices[host]
@@ -528,7 +528,7 @@ class HostCache():
         if host in self.mgr.offline_hosts:
             logger.debug(f'Host "{host}" marked as offline. Skipping gather facts refresh')
             return False
-        cutoff = datetime.datetime.utcnow() - datetime.timedelta(
+        cutoff = datetime_now() - datetime.timedelta(
             seconds=self.mgr.facts_cache_timeout)
         if host not in self.last_facts_update or self.last_facts_update[host] < cutoff:
             return True