|
 |
ad6f28 |
From 2b46bf710ff266a5727f5c101872c778d470dcb4 Mon Sep 17 00:00:00 2001
|
|
|
ad6f28 |
From: Jan Jansky <jjansky@redhat.com>
|
|
|
ad6f28 |
Date: Wed, 15 Jul 2020 13:38:52 +0200
|
|
|
ad6f28 |
Subject: [PATCH] [gluster] remove only dump files
|
|
|
ad6f28 |
|
|
|
ad6f28 |
Removes only dump files and leaving
|
|
|
ad6f28 |
other files as .socket or sock.
|
|
|
ad6f28 |
|
|
|
ad6f28 |
Resolves: #2152
|
|
|
ad6f28 |
|
|
|
ad6f28 |
Signed-off-by: Jan Jansky <jjansky@redhat.com>
|
|
|
ad6f28 |
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
|
|
|
ad6f28 |
---
|
|
|
ad6f28 |
sos/plugins/gluster.py | 17 ++++++++---------
|
|
|
ad6f28 |
1 file changed, 8 insertions(+), 9 deletions(-)
|
|
|
ad6f28 |
|
|
|
ad6f28 |
diff --git a/sos/plugins/gluster.py b/sos/plugins/gluster.py
|
|
|
ad6f28 |
index 9540d323..9815bbe7 100644
|
|
|
ad6f28 |
--- a/sos/plugins/gluster.py
|
|
|
ad6f28 |
+++ b/sos/plugins/gluster.py
|
|
|
ad6f28 |
@@ -40,15 +40,14 @@ class Gluster(Plugin, RedHatPlugin):
|
|
|
ad6f28 |
ret = string.count(last_line, 'DUMP_END_TIME')
|
|
|
ad6f28 |
|
|
|
ad6f28 |
def postproc(self):
|
|
|
ad6f28 |
- if not os.path.exists(self.statedump_dir):
|
|
|
ad6f28 |
- return
|
|
|
ad6f28 |
- try:
|
|
|
ad6f28 |
- for dirs in os.listdir(self.statedump_dir):
|
|
|
ad6f28 |
- os.remove(os.path.join(self.statedump_dir, dirs))
|
|
|
ad6f28 |
- os.rmdir(self.statedump_dir)
|
|
|
ad6f28 |
- os.unlink('/tmp/glusterdump.options')
|
|
|
ad6f28 |
- except OSError:
|
|
|
ad6f28 |
- pass
|
|
|
ad6f28 |
+ if self.get_option("dump"):
|
|
|
ad6f28 |
+ if not os.path.exists(self.statedump_dir):
|
|
|
ad6f28 |
+ return
|
|
|
ad6f28 |
+ try:
|
|
|
ad6f28 |
+ for name in glob.glob(self.statedump_dir + '/*.dump.[0-9]*'):
|
|
|
ad6f28 |
+ os.remove(name)
|
|
|
ad6f28 |
+ except OSError:
|
|
|
ad6f28 |
+ pass
|
|
|
ad6f28 |
|
|
|
ad6f28 |
def setup(self):
|
|
|
ad6f28 |
self.add_forbidden_path("/var/lib/glusterd/geo-replication/secret.pem")
|
|
|
ad6f28 |
--
|
|
|
ad6f28 |
2.26.2
|
|
|
ad6f28 |
|
|
|
ad6f28 |
From 7994ea1cc22ae256f08426ef37931b7b58f0fefc Mon Sep 17 00:00:00 2001
|
|
|
ad6f28 |
From: Jan Jansky <jjansky@redhat.com>
|
|
|
ad6f28 |
Date: Thu, 16 Jul 2020 14:34:49 +0200
|
|
|
ad6f28 |
Subject: [PATCH] [gluster] remove generated state files
|
|
|
ad6f28 |
|
|
|
ad6f28 |
Remove also generated state files in
|
|
|
ad6f28 |
/run/gluster.
|
|
|
ad6f28 |
|
|
|
ad6f28 |
Resolves: #2154
|
|
|
ad6f28 |
|
|
|
ad6f28 |
Signed-off-by: Jan Jansky <jjansky@redhat.com>
|
|
|
ad6f28 |
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
|
|
|
ad6f28 |
---
|
|
|
ad6f28 |
sos/plugins/gluster.py | 5 ++++-
|
|
|
ad6f28 |
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
ad6f28 |
|
|
|
ad6f28 |
diff --git a/sos/plugins/gluster.py b/sos/plugins/gluster.py
|
|
|
ad6f28 |
index 9815bbe7..7b6a9298 100644
|
|
|
ad6f28 |
--- a/sos/plugins/gluster.py
|
|
|
ad6f28 |
+++ b/sos/plugins/gluster.py
|
|
|
ad6f28 |
@@ -45,7 +45,10 @@ class Gluster(Plugin, RedHatPlugin):
|
|
|
ad6f28 |
if not os.path.exists(self.statedump_dir):
|
|
|
ad6f28 |
return
|
|
|
ad6f28 |
try:
|
|
|
ad6f28 |
- for name in glob.glob(self.statedump_dir + '/*.dump.[0-9]*'):
|
|
|
ad6f28 |
+ remove_files = glob.glob(self.statedump_dir + '/*.dump.[0-9]*')
|
|
|
ad6f28 |
+ remove_files.extend(glob.glob(self.statedump_dir +
|
|
|
ad6f28 |
+ '/glusterd_state_[0-9]*_[0-9]*'))
|
|
|
ad6f28 |
+ for name in remove_files:
|
|
|
ad6f28 |
os.remove(name)
|
|
|
ad6f28 |
except OSError:
|
|
|
ad6f28 |
pass
|
|
|
ad6f28 |
--
|
|
|
ad6f28 |
2.26.2
|
|
|
ad6f28 |
|