]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Revert "cephfs-top: add version in header" revert-48666-wip-cephfs-top-version
authorVenky Shankar <vshankar@redhat.com>
Mon, 7 Nov 2022 06:09:49 +0000 (11:39 +0530)
committerGitHub <noreply@github.com>
Mon, 7 Nov 2022 06:09:49 +0000 (11:39 +0530)
doc/cephfs/cephfs-top.png
src/tools/cephfs/top/cephfs-top

index 712b377f55d583767f7a78168574812da264fcf5..7299c82fbcffabb01e569373900bd7db808c4f27 100644 (file)
Binary files a/doc/cephfs/cephfs-top.png and b/doc/cephfs/cephfs-top.png differ
index 27c0f0118e0a2412a54119dd14d30347f862c214..63744ea75611a7c93d56cab484694ecfec04ee79 100755 (executable)
@@ -40,7 +40,7 @@ FS_TOP_ALL_FS_APP = 'ALL_FS_APP'
 FS_TOP_FS_SELECTED_APP = 'SELECTED_FS_APP'
 
 # version match b/w fstop and stats emitted by mgr/stats
-FS_TOP_SUPPORTED_VER = 2.0
+FS_TOP_SUPPORTED_VER = 2
 
 ITEMS_PAD_LEN = 3
 ITEMS_PAD = " " * ITEMS_PAD_LEN
@@ -85,7 +85,7 @@ MAIN_WINDOW_TOP_LINE_METRICS = OrderedDict([
 ])
 MGR_STATS_COUNTERS = list(MAIN_WINDOW_TOP_LINE_METRICS.keys())
 
-FS_TOP_VERSION_HEADER_FMT = '{prog_name} v{version} - {now}'
+FS_TOP_VERSION_HEADER_FMT = '{prog_name} - {now}'
 FS_TOP_CLIENT_HEADER_FMT = 'Total Client(s): {num_clients} - '\
     '{num_mounts} FUSE, {num_kclients} kclient, {num_libs} libcephfs'
 FS_TOP_NAME_TOPL_FMT = 'Filesystem: {fs_name} - {client_count} client(s)'
@@ -805,7 +805,6 @@ class FSTop(object):
                 num_libs = num_clients - (num_mounts + num_kclients)
         now = datetime.now().ctime()
         self.header.addstr(0, 0, FS_TOP_VERSION_HEADER_FMT.format(prog_name=FS_TOP_PROG_STR,
-                                                                  version=FS_TOP_SUPPORTED_VER,
                                                                   now=now), curses.A_BOLD)
         self.header.addstr(2, 0, screen_title, curses.color_pair(color_id) | curses.A_BOLD)
         self.header.addstr(3, 0, FS_TOP_CLIENT_HEADER_FMT.format(num_clients=num_clients,