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: v14.2.5~5^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=332d6aab4463ece05ec81848a17762c7f27fa7b3;p=ceph.git

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

Broken by c691f2f8763a9db081a0b61294c5eedf4e9c2cee

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 6e2d917acabee8f0bad09c7aa0d4a9e8e02754b5)
---

diff --git a/src/pybind/mgr/crash/module.py b/src/pybind/mgr/crash/module.py
index 0b40a4445618c..3f4ee67986e23 100644
--- a/src/pybind/mgr/crash/module.py
+++ b/src/pybind/mgr/crash/module.py
@@ -160,10 +160,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: