Merge pull request #28912 from bk201/wip-40685-nautilus

nautilus: mgr/dashboard: Dentries value of MDS daemon in Filesystems page is inconsistent with ceph fs status output Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
ceph · Aug 12, 2019 · 3e59530 · 3e59530
2 parents fb33f1f + a3f5c73
commit 3e59530
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/pybind/mgr/dashboard/controllers/cephfs.py b/src/pybind/mgr/dashboard/controllers/cephfs.py
@@ -57,7 +57,8 @@ def mds_counters(self, fs_id):
             "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 @@ def fs_status(self, fs_id):
             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 @@ def fs_status(self, fs_id):
                 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
@@ -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;