]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/cephadm: do not refresh daemon and device inventory as often 33734/head
authorSage Weil <sage@redhat.com>
Wed, 4 Mar 2020 23:46:20 +0000 (17:46 -0600)
committerSage Weil <sage@redhat.com>
Wed, 4 Mar 2020 23:46:20 +0000 (17:46 -0600)
The device inventory rarely changes.

A daemon inventory of 60s may trigger every time around the loop when
doing upgrades, which is pretty slow (esp since it's currently done
synchronously).  We're doing a good job (I think?) of queueing refreshes,
so the only reason to time this data out is to catch daemon stops that
are caused by external factors.

Signed-off-by: Sage Weil <sage@redhat.com>
src/pybind/mgr/cephadm/module.py

index 1c6ed178cae9831adf560b92e1487f1264731be8..aeb1463ab1f5107c84102b33c494b8950e59760a 100644 (file)
@@ -545,13 +545,13 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
         {
             'name': 'device_cache_timeout',
             'type': 'secs',
-            'default': 10 * 60,
+            'default': 30 * 60,
             'desc': 'seconds to cache device inventory',
         },
         {
             'name': 'daemon_cache_timeout',
             'type': 'secs',
-            'default': 60,
+            'default': 10 * 60,
             'desc': 'seconds to cache service (daemon) inventory',
         },
         {