From 7c6f46fd463cbf6eb856e1e4105a4caaef092571 Mon Sep 17 00:00:00 2001 From: Kiefer Chang Date: Wed, 12 Jun 2019 12:22:36 +0800 Subject: [PATCH] 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 --- src/pybind/mgr/dashboard/controllers/cephfs.py | 7 ++++--- .../app/ceph/cephfs/cephfs-chart/cephfs-chart.component.ts | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/pybind/mgr/dashboard/controllers/cephfs.py b/src/pybind/mgr/dashboard/controllers/cephfs.py index 4ff75a28036d9..e16f04c61cc4d 100644 --- 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 1dd411677a756..89f9513b29dc9 100644 --- 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; -- 2.39.5