diff options
| author | Ponnuvel Palaniyappan <pponnuvel@gmail.com> | 2022-05-10 21:27:22 +0100 |
|---|---|---|
| committer | Jake Hunsaker <jhunsake@redhat.com> | 2022-05-16 14:13:41 -0400 |
| commit | 00ad729ad04b3424bbd532272a32700899b19cbd (patch) | |
| tree | 1c142636964760472cdecb657091be929f0472a4 | |
| parent | 4b8974675257269fc652f41d4a129b384fd6b80b (diff) | |
| download | sos-00ad729ad04b3424bbd532272a32700899b19cbd.tar.gz | |
[ceph_mon/ceph_osd] Collect ceph-mon backend type
Ceph uses leveldb (old versions) or rocksdb (current ones)
for metadata. The older filestore backend is deprecated since
Quincy (17.2.0) which uses leveldb. So it's useful to know
if, for example, ceph-mon is still using leveldb for metadata.
This can happen even after upgrading to newer Ceph versions
if the leveldb isn't migrated to leveldb.
Signed-off-by: Ponnuvel Palaniyappan <pponnuvel@gmail.com>
| -rw-r--r-- | sos/report/plugins/ceph_mon.py | 9 | ||||
| -rw-r--r-- | sos/report/plugins/ceph_osd.py | 9 |
2 files changed, 5 insertions, 13 deletions
diff --git a/sos/report/plugins/ceph_mon.py b/sos/report/plugins/ceph_mon.py index b0c00e90..905f68b1 100644 --- a/sos/report/plugins/ceph_mon.py +++ b/sos/report/plugins/ceph_mon.py @@ -28,9 +28,9 @@ class CephMON(Plugin, RedHatPlugin, UbuntuPlugin): }) self.add_copy_spec([ - "/var/log/ceph/ceph-mon*.log", - "/var/lib/ceph/mon/", - "/run/ceph/ceph-mon*" + "/run/ceph/ceph-mon*", + "/var/lib/ceph/mon/*/kv_backend", + "/var/log/ceph/ceph-mon*.log" ]) self.add_cmd_output([ @@ -110,14 +110,11 @@ class CephMON(Plugin, RedHatPlugin, UbuntuPlugin): "ceph tell mon.%s mon_status" % mon_id for mon_id in mon_ids ], subdir="json_output", tags="insights_ceph_health_detail") - # these can be cleaned up too but leaving them for safety for now self.add_forbidden_path([ "/etc/ceph/*keyring*", "/var/lib/ceph/*keyring*", "/var/lib/ceph/*/*keyring*", "/var/lib/ceph/*/*/*keyring*", - "/var/lib/ceph/osd", - "/var/lib/ceph/mon", # Excludes temporary ceph-osd mount location like # /var/lib/ceph/tmp/mnt.XXXX from sos collection. "/var/lib/ceph/tmp/*mnt*", diff --git a/sos/report/plugins/ceph_osd.py b/sos/report/plugins/ceph_osd.py index dc3d3af1..86fb0ef0 100644 --- a/sos/report/plugins/ceph_osd.py +++ b/sos/report/plugins/ceph_osd.py @@ -28,13 +28,10 @@ class CephOSD(Plugin, RedHatPlugin, UbuntuPlugin): # Only collect OSD specific files self.add_copy_spec([ + "/run/ceph/ceph-osd*", + "/var/lib/ceph/osd/*/kv_backend", "/var/log/ceph/ceph-osd*.log", "/var/log/ceph/ceph-volume*.log", - - "/var/lib/ceph/osd/", - "/var/lib/ceph/bootstrap-osd/", - - "/run/ceph/ceph-osd*" ]) self.add_cmd_output([ @@ -96,8 +93,6 @@ class CephOSD(Plugin, RedHatPlugin, UbuntuPlugin): "/var/lib/ceph/*keyring*", "/var/lib/ceph/*/*keyring*", "/var/lib/ceph/*/*/*keyring*", - "/var/lib/ceph/osd", - "/var/lib/ceph/mon", # Excludes temporary ceph-osd mount location like # /var/lib/ceph/tmp/mnt.XXXX from sos collection. "/var/lib/ceph/tmp/*mnt*", |