From: Sage Weil <sage@redhat.com>
Date: Wed, 17 Jul 2019 16:15:35 +0000 (-0500)
Subject: mgr/telemetry: fix remote into crash do_ls()
X-Git-Tag: v15.1.0~2091^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=01d1d232abec93a591e936acd195023bc8c51a69;p=ceph.git

mgr/telemetry: fix remote into crash do_ls()

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 d8fd7bbc19aa..d605dd34fe86 100644
--- a/src/pybind/mgr/crash/module.py
+++ b/src/pybind/mgr/crash/module.py
@@ -157,6 +157,11 @@ class Module(MgrModule):
             self._refresh_health_checks()
         return 0, '', ''
 
+    def ls(self):
+        if not self.crashes:
+            self._load_crashes()
+        return self.do_ls({'prefix': 'crash ls'}, '')
+
     def do_ls(self, cmd, inbuf):
         if cmd['prefix'] == 'crash ls':
             r = self.crashes.values()
diff --git a/src/pybind/mgr/telemetry/module.py b/src/pybind/mgr/telemetry/module.py
index 9b05c19a94b1..8e2452795eb8 100644
--- a/src/pybind/mgr/telemetry/module.py
+++ b/src/pybind/mgr/telemetry/module.py
@@ -168,7 +168,7 @@ class Module(MgrModule):
 
     def gather_crashinfo(self):
         crashlist = list()
-        errno, crashids, err = self.remote('crash', 'do_ls', '', '')
+        errno, crashids, err = self.remote('crash', 'ls')
         if errno:
             return ''
         for crashid in crashids.split():