diff --git a/0021-fix-user-and-partition-field-in-sql.patch b/0021-fix-user-and-partition-field-in-sql.patch new file mode 100644 index 0000000000000000000000000000000000000000..92828cf9f0d8219fa0b6638fd636f061670e6a94 --- /dev/null +++ b/0021-fix-user-and-partition-field-in-sql.patch @@ -0,0 +1,42 @@ +From ddcf1364b6ba6efc2ea4bc4f1983d51e59b0919b Mon Sep 17 00:00:00 2001 +From: motodiary +Date: Tue, 21 May 2024 09:56:29 +0800 +Subject: [PATCH] fix 'user' and 'partition' field in sql + +--- + src/plugins/accounting_storage/pgsql/as_pgsql_assoc.c | 4 ++-- + src/plugins/accounting_storage/pgsql/as_pgsql_problems.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/plugins/accounting_storage/pgsql/as_pgsql_assoc.c b/src/plugins/accounting_storage/pgsql/as_pgsql_assoc.c +index b613738..d198a95 100755 +--- a/src/plugins/accounting_storage/pgsql/as_pgsql_assoc.c ++++ b/src/plugins/accounting_storage/pgsql/as_pgsql_assoc.c +@@ -849,9 +849,9 @@ static int _modify_unset_users(pgsql_conn_t *pgsql_conn, + + char *assoc_inx[] = { + "id_assoc", +- "user", ++ "\"user\"", + "acct", +- "partition", ++ "\"partition\"", + "max_jobs", + "max_jobs_accrue", + "min_prio_thresh", +diff --git a/src/plugins/accounting_storage/pgsql/as_pgsql_problems.c b/src/plugins/accounting_storage/pgsql/as_pgsql_problems.c +index 35fa070..2262a0c 100755 +--- a/src/plugins/accounting_storage/pgsql/as_pgsql_problems.c ++++ b/src/plugins/accounting_storage/pgsql/as_pgsql_problems.c +@@ -228,7 +228,7 @@ extern int as_pgsql_acct_no_users(pgsql_conn_t *pgsql_conn, + /* if this changes you will need to edit the corresponding enum */ + char *assoc_req_inx[] = { + "id_assoc", +- "user", ++ "\"user\"", + "acct", + "\"partition\"", + "parent_acct", +-- +2.33.0 + diff --git a/slurm.spec b/slurm.spec index 0bd1b946219efd5aeb644852cdb1bd7d1c21203f..114f6a5e00845db5b224bb3cd31119c59dd4ff86 100644 --- a/slurm.spec +++ b/slurm.spec @@ -1,6 +1,6 @@ Name: slurm Version: 21.08.8 -%define rel 23 +%define rel 24 Release: %{rel}%{?dist} Summary: Slurm Workload Manager @@ -36,6 +36,7 @@ Patch17: 0017-update-jobcomp_table-field.patch Patch18: 0018-update-get_parent_limits-stored-procedure.patch Patch19: 0019-Adjusting-some-SQL-statements.patch Patch20: 0020-replace-UNIX_TIMESTAMP-in-sql.patch +Patch21: 0021-fix-user-and-partition-field-in-sql.patch # build options .rpmmacros options change to default action # ==================== ==================== ======================== @@ -728,6 +729,9 @@ rm -rf %{buildroot} %systemd_postun_with_restart slurmdbd.service %changelog +* Tue May 21 2024 Xing Liu - 21.08.8-24 +- fix 'user' and 'partition' field in sql + * Mon May 20 2024 Xing Liu - 21.08.8-23 - replace UNIX_TIMESTAMP in sql