mgr/dashboard: use mds_mem.dn for fs dentries

mds_mem.dn is more accurate for representing fs dentries.
Switching from mds.inodes to mds_mem.dn creates consistency with output
of `ceph fs status` command.

Also in Cephfs counter chart, series of mds_mem.ino is displayed now
for consistency.

See https://github.com/ceph/ceph/pull/15255

Fixes: https://tracker.ceph.com/issues/40097
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>

diff --git a/src/pybind/mgr/dashboard/controllers/cephfs.py b/src/pybind/mgr/dashboard/controllers/cephfs.py
index 4ff75a28036d92c2c3029d4fb32960c107eca31c..e16f04c61cc4d16aef11e565b82b13963d061b86 100644 (file)
--- a/src/pybind/mgr/dashboard/controllers/cephfs.py
+++ b/src/pybind/mgr/dashboard/controllers/cephfs.py
@@ -57,7 +57,8 @@ class CephFS(RESTController):
             "mds.imported_inodes",
             "mds.inodes",
             "mds.caps",
-            "mds.subtrees"
+            "mds.subtrees",
+            "mds_mem.ino"
         ]
 
         fs_id = self.fs_id_to_int(fs_id)
@@ -126,7 +127,7 @@ class CephFS(RESTController):
             if up:
                 gid = mdsmap['up']["mds_{0}".format(rank)]
                 info = mdsmap['info']['gid_{0}'.format(gid)]
-                dns = mgr.get_latest("mds", info['name'], "mds.inodes")
+                dns = mgr.get_latest("mds", info['name'], "mds_mem.dn")
                 inos = mgr.get_latest("mds", info['name'], "mds_mem.ino")
 
                 if rank == 0:
@@ -187,7 +188,7 @@ class CephFS(RESTController):
                 continue
 
             inos = mgr.get_latest("mds", daemon_info['name'], "mds_mem.ino")
-            dns = mgr.get_latest("mds", daemon_info['name'], "mds.inodes")
+            dns = mgr.get_latest("mds", daemon_info['name'], "mds_mem.dn")
 
             activity = CephService.get_rate(
                 "mds", daemon_info['name'], "mds_log.replay")

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.ts
index 1dd411677a75621917afa8c693ee8c9d48fce9cb..89f9513b29dc9d40b29089c2108900700074a335 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/cephfs/cephfs-chart/cephfs-chart.component.ts
@@ -19,7 +19,7 @@ export class CephfsChartComponent implements OnChanges, OnInit {
   @Input()
   mdsCounter: any;
 
-  lhsCounter = 'mds.inodes';
+  lhsCounter = 'mds_mem.ino';
   rhsCounter = 'mds_server.handle_client_request';
 
   chart: any;