]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cephfs-top: navigate to home screen while selecting sort field, if no filesystems. 50596/head
authorNeeraj Pratap Singh <Neeraj.Pratap.Singh1@ibm.com>
Tue, 21 Feb 2023 12:56:37 +0000 (18:26 +0530)
committerNeeraj Pratap Singh <Neeraj.Pratap.Singh1@ibm.com>
Mon, 20 Mar 2023 11:28:20 +0000 (16:58 +0530)
Fixes: https://tracker.ceph.com/issues/58813
Signed-off-by: Neeraj Pratap Singh <neesingh@redhat.com>
(cherry picked from commit db48c819bb28bd900df031a39ad687e7dc8ce6a5)

Conflicts:
src/tools/cephfs/top/cephfs-top:self.active_screen is being
changed to self.current_screen as this name change is not backported
to pacific, so continuing with the name which exists in pacific.

src/tools/cephfs/top/cephfs-top

index 327ac050fb3648d35e3685ae9d6e3f9984a3a5c1..6de81361ef5da6f4d009355861aff13cba39c2da 100755 (executable)
@@ -359,10 +359,10 @@ class FSTop(object):
                 endwhile = True
             elif key == ord('q'):
                 self.stdscr.erase()
-                if isinstance(current_states['last_fs'], list):
-                    self.run_all_display()
-                else:
+                if fs_list and self.current_screen == FS_TOP_FS_SELECTED_APP:
                     self.run_display()
+                else:
+                    self.run_all_display()
                 endwhile = True
 
             try: