Merge PR #32686 into master

* refs/pull/32686/head:
	mgr/cephadm: speed up when not refresh is needed
	mgr/cephadm: track age of service metadata
	mgr/orchestrator: include age of 'service ls' metadata
	mgr/mgr_util: add to_pretty_timedelta

Reviewed-by: Sebastian Wagner <swagner@suse.com>

src/pybind/mgr/cephadm/module.py

@@ -12,6 +12,7 @@
     pass  # just for type checking
 
 
+import datetime
 import six
 import os
 import random
@@ -22,6 +23,7 @@
 
 from ceph.deployment import inventory
 from mgr_module import MgrModule
+import mgr_util
 import orchestrator
 from orchestrator import OrchestratorError, HostSpec, OrchestratorValidationError
 
@@ -46,6 +48,8 @@
                       'StrictHostKeyChecking no\n'
                       'UserKnownHostsFile /dev/null\n')
 
+DATEFMT = '%Y-%m-%dT%H:%M:%S.%f'
+
 # for py2 compat
 try:
     from tempfile import TemporaryDirectory # py3
@@ -1075,6 +1079,8 @@ def _refresh_host_services(self, host):
         out, err, code = self._run_cephadm(
             host, 'mon', 'ls', [], no_fsid=True)
         data = json.loads(''.join(out))
+        for d in data:
+            d['last_refresh'] = datetime.datetime.utcnow().strftime(DATEFMT)
         self.log.debug('Refreshed host %s services: %s' % (host, data))
         self.service_cache[host] = orchestrator.OutdatableData(data)
         return host, data
@@ -1116,6 +1122,8 @@ def _get_services_result(results):
                         continue
                     self.log.debug('including %s %s' % (host, d))
                     sd = orchestrator.ServiceDescription()
+                    sd.last_refresh = datetime.datetime.strptime(
+                        d.get('last_refresh'), DATEFMT)
                     sd.service_type = d['name'].split('.')[0]
                     if service_type and service_type != sd.service_type:
                         continue
@@ -1142,8 +1150,11 @@ def _get_services_result(results):
                     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):

src/pybind/mgr/mgr_module.py

@@ -5,6 +5,7 @@
 except ImportError:
     # just for type checking
     pass
+import datetime
 import logging
 import errno
 import json

src/pybind/mgr/mgr_util.py

@@ -1,4 +1,5 @@
 import contextlib
+import datetime
 import os
 import socket
 import logging
@@ -305,3 +306,18 @@ def _pairwise(iterable):
     for b in it:
         yield (a, b)
         a = b
+
+def to_pretty_timedelta(n):
+    if n < datetime.timedelta(seconds=120):
+        return str(n.seconds) + 's'
+    if n < datetime.timedelta(minutes=120):
+        return str(n.seconds // 60) + 'm'
+    if n < datetime.timedelta(hours=48):
+        return str(n.seconds // 360) + 'h'
+    if n < datetime.timedelta(days=14):
+        return str(n.days) + 'd'
+    if n < datetime.timedelta(days=7*12):
+        return str(n.days // 7) + 'w'
+    if n < datetime.timedelta(days=365*2):
+        return str(n.days // 30) + 'M'
+    return str(n.days // 365) + 'y'

src/pybind/mgr/orchestrator.py

@@ -1167,6 +1167,9 @@ def __init__(self, nodename=None,
         # Service status description when status == -1.
         self.status_desc = status_desc
 
+        # datetime when this info was last refreshed
+        self.last_refresh = None   # type: Optional[datetime.datetime]
+
     def name(self):
         if self.service_instance:
             return '%s.%s' % (self.service_type, self.service_instance)

src/pybind/mgr/orchestrator_cli/module.py

@@ -1,11 +1,12 @@
+import datetime
 import errno
 import json
 from functools import wraps
 
 from ceph.deployment.inventory import Device
 from prettytable import PrettyTable
 
-from mgr_util import format_bytes
+from mgr_util import format_bytes, to_pretty_timedelta
 
 try:
     from typing import List, Set, Optional
@@ -299,8 +300,9 @@ def ukn(s):
             data = [s.to_json() for s in services]
             return HandleCommandResult(stdout=json.dumps(data))
         else:
+            now = datetime.datetime.utcnow()
             table = PrettyTable(
-                ['NAME', 'HOST', 'STATUS',
+                ['NAME', 'HOST', 'STATUS', 'REFRESHED',
                  'VERSION', 'IMAGE NAME', 'IMAGE ID', 'CONTAINER ID'],
                 border=False)
             table.align = 'l'
@@ -314,10 +316,15 @@ def ukn(s):
                     None: '<unknown>'
                 }[s.status]
 
+                if s.last_refresh:
+                    age = to_pretty_timedelta(now - s.last_refresh) + ' ago'
+                else:
+                    age = '-'
                 table.add_row((
                     s.name(),
                     ukn(s.nodename),
                     status,
+                    age,
                     ukn(s.version),
                     ukn(s.container_image_name),
                     ukn(s.container_image_id)[0:12],