From 6402b4240929b334c31a38a9c86e16e0b6a9e4dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Fern=C3=A1ndez=20Rodr=C3=ADguez?= Date: Fri, 21 Nov 2025 12:32:30 +0100 Subject: [PATCH] [pulpcore] RFE export table contents as CSV MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Resolves: #4152 Signed-off-by: Pablo Fernández Rodríguez --- sos/report/plugins/pulpcore.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sos/report/plugins/pulpcore.py b/sos/report/plugins/pulpcore.py index ffd53e01..4b126e78 100644 --- a/sos/report/plugins/pulpcore.py +++ b/sos/report/plugins/pulpcore.py @@ -127,14 +127,15 @@ class PulpCore(Plugin, IndependentPlugin): "AND table_schema = 'public' AND column_name NOT IN" " ('args', 'kwargs', 'enc_args', 'enc_kwargs'))" " TO STDOUT;") - col_out = self.exec_cmd(self.build_query_cmd(_query), env=self.env, + col_out = self.exec_cmd(self.build_query_cmd(_query, csv=False), + env=self.env, runas=self.runas, container=self.in_container) columns = col_out['output'] if col_out['status'] == 0 else '*' _query = (f"select {columns} from {table} where pulp_last_updated" f"> NOW() - interval '{task_days} days' order by" " pulp_last_updated") - _cmd = self.build_query_cmd(_query) + _cmd = self.build_query_cmd(_query, csv=True) self.add_cmd_output(_cmd, env=self.env, suggest_filename=table, runas=self.runas, container=self.in_container) @@ -152,7 +153,8 @@ class PulpCore(Plugin, IndependentPlugin): "pg_total_relation_size(reltoastrelid) AS toast_bytes " "FROM pg_class c LEFT JOIN pg_namespace n ON " "n.oid = c.relnamespace WHERE relkind = 'r') a) a order by " - "total_bytes DESC" + "total_bytes DESC", + csv=False ) self.add_cmd_output(_cmd, suggest_filename='pulpcore_db_tables_sizes', env=self.env, runas=self.runas, @@ -168,7 +170,7 @@ class PulpCore(Plugin, IndependentPlugin): """ if csv: query = f"COPY ({query}) TO STDOUT " \ - "WITH (FORMAT 'csv', DELIMITER ',', HEADER)" + "WITH (FORMAT 'csv', DELIMITER ';', HEADER)" _dbcmd = "psql --no-password -h %s -p %s -U %s -d %s -c %s" return _dbcmd % (self.dbhost, self.dbport, self.dbuser, self.dbname, quote(query)) -- 2.51.1