From: Sage Weil <sage@redhat.com>
Date: Sun, 14 Jul 2019 16:26:41 +0000 (-0500)
Subject: mgr/crash: add 'crash ls-new'
X-Git-Tag: v15.1.0~2091^2~15
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bebb1c31006ff3cba67831879b34699cf111f945;p=ceph.git

mgr/crash: add 'crash ls-new'

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

diff --git a/doc/mgr/crash.rst b/doc/mgr/crash.rst
index 8a988103022e..8cfd130f2aa1 100644
--- a/doc/mgr/crash.rst
+++ b/doc/mgr/crash.rst
@@ -37,7 +37,13 @@ Remove a specific crash dump.
 
   ceph crash ls
 
-List the timestamp/uuid crashids for all saved crash info.
+List the timestamp/uuid crashids for all new and archived crash info.
+
+::
+
+  ceph crash ls-new
+
+List the timestamp/uuid crashids for all newcrash info.
 
 ::
 
diff --git a/src/pybind/mgr/crash/module.py b/src/pybind/mgr/crash/module.py
index 8b949af1b18f..dec4f50a5570 100644
--- a/src/pybind/mgr/crash/module.py
+++ b/src/pybind/mgr/crash/module.py
@@ -107,10 +107,15 @@ class Module(MgrModule):
             self.crashes[crashid] = metadata
             key = 'crash/%s' % crashid
             self.set_store(key, json.dumps(metadata))
+            self._refresh_health_checks()
         return 0, '', ''
 
     def do_ls(self, cmd, inbuf):
-        r = self.crashes.values()
+        if cmd['prefix'] == 'crash ls':
+            r = self.crashes.values()
+        else:
+            r = [crash for crashid, crash in self.crashes.items()
+                 if 'archived' not in crash]
         if cmd.get('format') == 'json' or cmd.get('format') == 'json-pretty':
             return 0, json.dumps(r, indent=4), ''
         else:
@@ -256,7 +261,13 @@ class Module(MgrModule):
         },
         {
             'cmd': 'crash ls',
-            'desc': 'Show saved crash dumps',
+            'desc': 'Show new and archived crash dumps',
+            'perm': 'r',
+            'handler': do_ls,
+        },
+        {
+            'cmd': 'crash ls-new',
+            'desc': 'Show new crash dumps',
             'perm': 'r',
             'handler': do_ls,
         },