]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: include timestamps for configured, created
authorSage Weil <sage@redhat.com>
Wed, 4 Mar 2020 14:51:50 +0000 (08:51 -0600)
committerSage Weil <sage@redhat.com>
Thu, 5 Mar 2020 12:42:26 +0000 (06:42 -0600)
created = when daemon was first created
configured = when the daemonw as last (re)configured

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

index 1180eb5ce7299d4d01dd6b2bc755608e86f323a4..4b51eb4c7ff44f3bb6a48b4b3ab129960b299bbf 100755 (executable)
@@ -1324,6 +1324,17 @@ def deploy_daemon(fsid, daemon_type, daemon_id, c, uid, gid,
         deploy_daemon_units(fsid, uid, gid, daemon_type, daemon_id, c,
                             osd_fsid=osd_fsid)
 
+    if not os.path.exists(data_dir + '/unit.created'):
+        with open(data_dir + '/unit.created', 'w') as f:
+            os.fchmod(f.fileno(), 0o600)
+            os.fchown(f.fileno(), uid, gid)
+            f.write('mtime is time the daemon deployment was created\n')
+
+    with open(data_dir + '/unit.configured', 'w') as f:
+        f.write('mtime is time we were last configured\n')
+        os.fchmod(f.fileno(), 0o600)
+        os.fchown(f.fileno(), uid, gid)
+
     update_firewalld(daemon_type)
 
     if reconfig and daemon_type not in Ceph.daemons:
@@ -2442,8 +2453,14 @@ def list_daemons(detail=True, legacy_dir=None):
                         i['container_image_id'] = image_id
                         i['version'] = version
                         i['started'] = start_stamp
+                        i['created'] = get_file_timestamp(
+                            os.path.join(data_dir, fsid, j, 'unit.created')
+                        )
                         i['deployed'] = get_file_timestamp(
                             os.path.join(data_dir, fsid, j, 'unit.image'))
+                        i['configured'] = get_file_timestamp(
+                            os.path.join(data_dir, fsid, j, 'unit.configured'))
+
                     ls.append(i)
 
     # /var/lib/rook