From: Sage Weil <sage@redhat.com>
Date: Thu, 14 Mar 2019 22:12:11 +0000 (-0500)
Subject: mgr/crash: include entity (instead of daemon) in 'crash ls'
X-Git-Tag: v14.2.0~15^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F26959%2Fhead;p=ceph.git

mgr/crash: include entity (instead of daemon) in 'crash ls'

The daemon name is implied by the entity, and the entity is more useful.

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 98a735d9e52..18aed3fba62 100644
--- a/src/pybind/mgr/crash/module.py
+++ b/src/pybind/mgr/crash/module.py
@@ -80,10 +80,8 @@ class Module(MgrModule):
     def do_ls(self, cmd, inbuf):
         keys = []
         for k, meta in self.timestamp_filter(lambda ts: True):
-            process_name = meta.get('process_name', 'unknown')
-            if not process_name:
-                process_name = 'unknown'
-            keys.append("%s %s" % (k.replace('crash/', ''), process_name))
+            entity_name = meta.get('entity_name', 'unknown')
+            keys.append("%s %s" % (k.replace('crash/', ''), entity_name))
         keys.sort()
         return 0, '\n'.join(keys), ''