From 61e097b2cbc7eac83f9cff644f500be9247f7847 Mon Sep 17 00:00:00 2001 From: Jos Collin Date: Mon, 20 Feb 2023 11:41:53 +0530 Subject: [PATCH] cephfs-top: navigate to home screen when no fs Return back to the home (All Filesystem Info) screen, when all the filesystems are removed while waiting for a key input in set_key(). There's no need to return to `Selected FS` screen. Fixes: https://tracker.ceph.com/issues/58823 Signed-off-by: Jos Collin --- src/tools/cephfs/top/cephfs-top | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tools/cephfs/top/cephfs-top b/src/tools/cephfs/top/cephfs-top index 5461b9d759531..3f480ad664d51 100755 --- a/src/tools/cephfs/top/cephfs-top +++ b/src/tools/cephfs/top/cephfs-top @@ -385,7 +385,7 @@ class FSTop(FSTopBase): stdscr.clear() h, w = stdscr.getmaxyx() title = ['No filesystem available', - 'Press "q" to go back to home (all filesystem info) screen'] + 'Press "q" to go back to home (All Filesystem Info) screen'] pos_x1 = w // 2 - len(title[0]) // 2 pos_x2 = w // 2 - len(title[1]) // 2 stdscr.addstr(1, pos_x1, title[0], curses.A_STANDOUT | curses.A_BOLD) @@ -413,10 +413,10 @@ class FSTop(FSTopBase): endmenu = True elif key == ord('q'): self.stdscr.erase() - if self.active_screen == FS_TOP_ALL_FS_APP: - self.run_all_display() - else: + if fs_list and self.active_screen == FS_TOP_FS_SELECTED_APP: self.run_display() + else: + self.run_all_display() endmenu = True try: -- 2.39.5