From: Sage Weil <sage@redhat.com>
Date: Tue, 3 Dec 2019 13:12:26 +0000 (-0600)
Subject: mgr/crash: fix 'crash ls[-new]' sorting
X-Git-Tag: v15.1.0~683^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F31973%2Fhead;p=ceph.git

mgr/crash: fix 'crash ls[-new]' sorting

Broken by c691f2f8763a9db081a0b61294c5eedf4e9c2cee

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/pybind/mgr/crash/module.py b/src/pybind/mgr/crash/module.py
index 34128b93c238..245e88da1362 100644
--- a/src/pybind/mgr/crash/module.py
+++ b/src/pybind/mgr/crash/module.py
@@ -200,10 +200,11 @@ class Module(MgrModule):
 
     def do_ls(self, cmd, inbuf):
         if cmd['prefix'] == 'crash ls':
-            r = self.crashes.values()
+            t = self.crashes.values()
         else:
-            r = [crash for crashid, crash in self.crashes.items()
+            t = [crash for crashid, crash in self.crashes.items()
                  if 'archived' not in crash]
+        r = sorted(t, key=lambda i: i.get('crash_id'))
         if cmd.get('format') == 'json' or cmd.get('format') == 'json-pretty':
             return 0, json.dumps(r, indent=4), ''
         else: