]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cephfs-top: Handle `METRIC_TYPE_NONE` fields for sorting 50597/head
authorNeeraj Pratap Singh <Neeraj.Pratap.Singh1@ibm.com>
Tue, 21 Feb 2023 10:10:13 +0000 (15:40 +0530)
committerNeeraj Pratap Singh <Neeraj.Pratap.Singh1@ibm.com>
Mon, 20 Mar 2023 11:34:39 +0000 (17:04 +0530)
Currently, the sort feature in cephfs-top isn't applicable
to the fields which are of type `METRIC_TYPE_NONE` , named as
'ofiles', 'oicaps' and 'oinodes'. This commit will make the
cephfs-top sort feature to support the above mentioned fields too.
From this commit onwards, all the current fields displayed in
cephfs-top can be used for sorting.

Fixes: https://tracker.ceph.com/issues/58814
Signed-off-by: Neeraj Pratap Singh <neesingh@redhat.com>
(cherry picked from commit 4626cb5fb1141c38acd4b114ad4562bd14fa7aad)

Conflicts:
src/tools/cephfs/top/cephfs-top:Removed the changes that are
not backported to pacific.Changes of this #48664 which were conflicting
the changes done in this PR

src/tools/cephfs/top/cephfs-top

index 7104d9a441492f9e229663f166026828d805daa6..aaf1882d96328be2fa9a35dab0e04e0ce6b80ccb 100755 (executable)
@@ -734,6 +734,7 @@ class FSTop(object):
                                         f'{speed}', curses.A_DIM)
                 else:
                     # display 0th element from metric tuple
+                    metrics_dict[fs_name][client_id][self.items(item)] = m[0]
                     self.fsstats.addstr(y_coord, coord[0], f'{m[0]}', curses.A_DIM)
             else:
                 self.fsstats.addstr(y_coord, coord[0], "N/A", curses.A_DIM)