From 6d7a80a2cc8c5b6513e597d251e735497515c81e Mon Sep 17 00:00:00 2001 From: motodiary Date: Wed, 5 Jun 2024 10:05:41 +0800 Subject: [PATCH] Remove redundant tres_table fields --- 0043-Remove-redundant-tres_table-fields.patch | 25 +++++++++++++++++++ slurm.spec | 6 ++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 0043-Remove-redundant-tres_table-fields.patch diff --git a/0043-Remove-redundant-tres_table-fields.patch b/0043-Remove-redundant-tres_table-fields.patch new file mode 100644 index 0000000..1d703ed --- /dev/null +++ b/0043-Remove-redundant-tres_table-fields.patch @@ -0,0 +1,25 @@ +From 7645cf9f06696ad8296363a39074036acbe7e889 Mon Sep 17 00:00:00 2001 +From: motodiary +Date: Wed, 5 Jun 2024 10:01:52 +0800 +Subject: [PATCH] Remove redundant tres_table fields + +--- + src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c b/src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c +index b7be941..2c0ad1e 100755 +--- a/src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c ++++ b/src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c +@@ -781,7 +781,7 @@ static int _as_pgsql_acct_check_tables(pgsql_conn_t *pgsql_conn) + "(\"type\", \"name\");", tres_table, tres_table); + xstrfmtcat(ending, "CREATE SEQUENCE IF NOT EXISTS %s_id_seq MINVALUE 1001 START WITH 1001;" + "ALTER TABLE %s ALTER COLUMN id SET DEFAULT nextval('%s_id_seq'::regclass);", +- tres_table, tres_table, tres_table, tres_table); ++ tres_table, tres_table, tres_table); + + if (pgsql_db_create_table(pgsql_conn, tres_table, tres_table_fields, ending) + == SLURM_ERROR) { +-- +2.33.0 + diff --git a/slurm.spec b/slurm.spec index f48bc3b..0bbe097 100644 --- a/slurm.spec +++ b/slurm.spec @@ -1,6 +1,6 @@ Name: slurm Version: 21.08.8 -%define rel 45 +%define rel 46 Release: %{rel}%{?dist} Summary: Slurm Workload Manager @@ -58,6 +58,7 @@ Patch39: 0039-fix-association-GrpTRES-get_parent_limits-errors.patch Patch40: 0040-Remove-redundant-SQL-statements-in-adding-tres.patch Patch41: 0041-Fix-compilation-warnings.patch Patch42: 0042-Change-the-serial-type-to-integer.patch +Patch43: 0043-Remove-redundant-tres_table-fields.patch # build options .rpmmacros options change to default action # ==================== ==================== ======================== @@ -750,6 +751,9 @@ rm -rf %{buildroot} %systemd_postun_with_restart slurmdbd.service %changelog +* Wed Jun 05 2024 Xing Liu - 21.08.8-46 +- Remove redundant tres_table fields + * Tue Jun 04 2024 Xing Liu - 21.08.8-45 - Change the serial type to integer -- Gitee