RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-21 01:47:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #31973 into master

Browse Source 
* refs/pull/31973/head:
	mgr/crash: fix 'crash ls[-new]' sorting

Reviewed-by: Sebastian Wagner <swagner@suse.com>
This commit is contained in:
Sage Weil 2019-12-03 11:32:55 -06:00
commit d5f1730025
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pybind/mgr/crash/module.py
View File

@ -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: