]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #47978 from neesingh-rh/wip-57439-pacific
authorYuri Weinstein <yweinste@redhat.com>
Mon, 19 Sep 2022 16:24:04 +0000 (09:24 -0700)
committerGitHub <noreply@github.com>
Mon, 19 Sep 2022 16:24:04 +0000 (09:24 -0700)
pacific: cephfs-top: display average read/write/metadata latency

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Anthony D'Atri <anthony.datri@gmail.com>
1  2 
src/pybind/mgr/stats/fs/perf_stats.py
src/tools/cephfs/top/cephfs-top

Simple merge
index 8203fc164eaa732db2ca51d655cc91edf2d285e1,c2704cb38ff7351a6a9e7f27e0951ce1ec1821f5..f1a0281f59ffa4fd14d35eda2ed2b59114a3d818
@@@ -362,7 -399,11 +399,10 @@@ class FSTop(object)
                  return
  
          cidx = 0
 -        client_id = x_coord_map[FS_TOP_MAIN_WINDOW_COL_CLIENT_ID]
          for item in counters:
+             if item in MAIN_WINDOW_TOP_LINE_METRICS_LEGACY:
+                 cidx += 1
+                 continue
              coord = x_coord_map[item]
              hlen = coord[1] - len(ITEMS_PAD)
              hlen = min(hlen, remaining_hlen)