46 lines
1.9 KiB
Diff
46 lines
1.9 KiB
Diff
|
From 751530acad7cb41a461b16bb7bbedf2753847ca4 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Pavel Moravec <pmoravec@redhat.com>
|
||
|
|
Date: Thu, 17 Feb 2022 11:51:20 +0100
|
||
|
|
Subject: [PATCH 06/10] [pulpcore] Stop collecting commands relevant to old
|
||
|
|
taskig system
|
||
|
|
|
||
|
|
The reserved resource approach was used by pulp-3 for a sporadic time
|
||
|
|
in early pulp-3 development only. It is abandoned and should not be
|
||
|
|
productised anywhere. So it is safe to remove the commands (together
|
||
|
|
with rq broker status that was in charge of reserved resources).
|
||
|
|
|
||
|
|
Resolves: #2865
|
||
|
|
|
||
|
|
Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
|
||
|
|
Signed-off-by: Sandro Bonazzola <sbonazzo@redhat.com>
|
||
|
|
---
|
||
|
|
sos/report/plugins/pulpcore.py | 5 -----
|
||
|
|
1 file changed, 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/sos/report/plugins/pulpcore.py b/sos/report/plugins/pulpcore.py
|
||
|
|
index 7a5d461c..426d4819 100644
|
||
|
|
--- a/sos/report/plugins/pulpcore.py
|
||
|
|
+++ b/sos/report/plugins/pulpcore.py
|
||
|
|
@@ -91,9 +91,6 @@ class PulpCore(Plugin, IndependentPlugin):
|
||
|
|
# skip collecting certificate keys
|
||
|
|
self.add_forbidden_path("/etc/pki/pulp/**/*.key", recursive=True)
|
||
|
|
|
||
|
|
- self.add_cmd_output("rq info -u redis://localhost:6379/8",
|
||
|
|
- env={"LC_ALL": "en_US.UTF-8"},
|
||
|
|
- suggest_filename="rq_info")
|
||
|
|
self.add_cmd_output("curl -ks https://localhost/pulp/api/v3/status/",
|
||
|
|
suggest_filename="pulp_status")
|
||
|
|
dynaconf_env = {"LC_ALL": "en_US.UTF-8",
|
||
|
|
@@ -105,8 +102,6 @@ class PulpCore(Plugin, IndependentPlugin):
|
||
|
|
|
||
|
|
task_days = self.get_option('task-days')
|
||
|
|
for table in ['core_task', 'core_taskgroup',
|
||
|
|
- 'core_reservedresourcerecord',
|
||
|
|
- 'core_taskreservedresourcerecord',
|
||
|
|
'core_groupprogressreport', 'core_progressreport']:
|
||
|
|
_query = "select * from %s where pulp_last_updated > NOW() - " \
|
||
|
|
"interval '%s days' order by pulp_last_updated" % \
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|