]> git.apps.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)
committerSebastian Wagner <sebastian.wagner@suse.com>
Mon, 22 Feb 2021 16:34:11 +0000 (17:34 +0100)
Be consistent!

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

src/pybind/mgr/cephadm/inventory.py

index 29a6c31156601a664a31354f1088986e6e2c2c8c..944d88c03fe2a3b29d45b4c7dd784363fdd06585 100644 (file)
@@ -298,7 +298,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]
@@ -544,7 +544,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