From: Yuri Weinstein <yweinste@redhat.com>
Date: Mon, 19 Sep 2022 16:24:04 +0000 (-0700)
Subject: Merge pull request #47978 from neesingh-rh/wip-57439-pacific
X-Git-Tag: v16.2.11~317
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=24d46a4d120af240a66ac10b74ee5bf9fe3dd35d;p=ceph.git

Merge pull request #47978 from neesingh-rh/wip-57439-pacific

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>
---

24d46a4d120af240a66ac10b74ee5bf9fe3dd35d
diff --cc src/tools/cephfs/top/cephfs-top
index 8203fc164eaa,c2704cb38ff7..f1a0281f59ff
--- a/src/tools/cephfs/top/cephfs-top
+++ b/src/tools/cephfs/top/cephfs-top
@@@ -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)