From: Neeraj Pratap Singh <Neeraj.Pratap.Singh1@ibm.com>
Date: Tue, 28 Mar 2023 10:26:24 +0000 (+0530)
Subject: cephfs-top: fixing the -d [--delay] option in cephfs-top
X-Git-Tag: v16.2.14~140^2~2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=016e0128733d85c5a2dbf661d50aa98c818dd7a7;p=ceph.git

cephfs-top: fixing the -d [--delay] option in cephfs-top

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

diff --git a/src/tools/cephfs/top/cephfs-top b/src/tools/cephfs/top/cephfs-top
index 076ebccc472fb..386acaa9cff69 100755
--- a/src/tools/cephfs/top/cephfs-top
+++ b/src/tools/cephfs/top/cephfs-top
@@ -45,8 +45,6 @@ FS_TOP_SUPPORTED_VER = 2
 ITEMS_PAD_LEN = 3
 ITEMS_PAD = " " * ITEMS_PAD_LEN
 DEFAULT_REFRESH_INTERVAL = 1
-# min refresh interval allowed
-MIN_REFRESH_INTERVAL = 0.5
 
 # metadata provided by mgr/stats
 FS_TOP_MAIN_WINDOW_COL_CLIENT_ID = "client_id"
@@ -1149,14 +1147,6 @@ class FSTop(FSTopBase):
 
 
 if __name__ == '__main__':
-    def float_greater_than(x):
-        value = float(x)
-        if value < MIN_REFRESH_INTERVAL:
-            raise argparse.ArgumentTypeError(
-                'Refresh interval should be greater than or equal to'
-                f' {MIN_REFRESH_INTERVAL}')
-        return value
-
     parser = argparse.ArgumentParser(description='Ceph Filesystem top utility')
     parser.add_argument('--cluster', nargs='?', const='ceph', default='ceph',
                         help='Ceph cluster to connect (defualt: ceph)')
@@ -1166,9 +1156,9 @@ if __name__ == '__main__':
                         help='Path to cluster configuration file')
     parser.add_argument('--selftest', dest='selftest', action='store_true',
                         help='Run in selftest mode')
-    parser.add_argument('-d', '--delay', nargs='?',
+    parser.add_argument('-d', '--delay', dest='delay', choices=range(1, 26),
                         default=DEFAULT_REFRESH_INTERVAL,
-                        type=float_greater_than,
+                        type=int,
                         help='Refresh interval in seconds '
                         f'(default: {DEFAULT_REFRESH_INTERVAL})')
     parser.add_argument('--dump', dest='dump', action='store_true',