diff --git a/0027-Adjusting-procedures.patch b/0027-Adjusting-procedures.patch new file mode 100644 index 0000000000000000000000000000000000000000..772bff05e39d1de5cf10503fed8b3ac33b72910b --- /dev/null +++ b/0027-Adjusting-procedures.patch @@ -0,0 +1,38 @@ +From ac9eea7488335864d90c6f544c5b5171bfb32bf4 Mon Sep 17 00:00:00 2001 +From: motodiary +Date: Fri, 24 May 2024 10:19:08 +0800 +Subject: [PATCH] Adjusting procedures + +--- + .../accounting_storage/pgsql/accounting_storage_pgsql.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c b/src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c +index 34882a5..3da1cfa 100755 +--- a/src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c ++++ b/src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c +@@ -681,7 +681,11 @@ static int _as_pgsql_acct_check_tables(pgsql_conn_t *pgsql_conn) + IF qos = '' THEN \n\ + s := s || 'qos, delta_qos, '; \n\ + ELSE \n\ +- s := s || qos || ', ' || delta_qos || ', '; \n\ ++ IF delta_qos = '' THEN \n\ ++ s := s || qos || ', ' || E'\'' || E'\'' || ', '; \n\ ++ ELSE \n\ ++ s := s || qos || ', ' || delta_qos || ', '; \n\ ++ END IF; \n\ + END IF; \n\ + \n\ + s := s || \n\ +@@ -694,7 +698,7 @@ static int _as_pgsql_acct_check_tables(pgsql_conn_t *pgsql_conn) + cluster || '_' || my_table || \n\ + ' WHERE acct = ''' || my_acct || ''' AND \"user\" = ''' || ''''; \n\ + \n\ +- EXECUTE s INTO par_id, mj, mja, mpt, msj, mwpj, prio, def_qos_id, qos, delta_qos, mtpj, mtpn, mtmpj, mtrm; \n\ ++ EXECUTE s INTO par_id, mj, mja, mpt, msj, mwpj, prio, def_qos_id, qos, delta_qos, mtpj, mtpn, mtmpj, mtrm, my_acct; \n\ + \n\ + EXIT WHEN without_limits = 0 OR my_acct = ''; \n\ + END LOOP; \n\ +-- +2.33.0 + diff --git a/slurm.spec b/slurm.spec index c6c41412ed63bc45169adf2c8c271609c33689b2..3601f55e7bf617d1324e2ace7ad67fa0247e6540 100644 --- a/slurm.spec +++ b/slurm.spec @@ -1,6 +1,6 @@ Name: slurm Version: 21.08.8 -%define rel 29 +%define rel 30 Release: %{rel}%{?dist} Summary: Slurm Workload Manager @@ -42,6 +42,7 @@ Patch23: 0023-modify-step-table.patch Patch24: 0024-update-the-implementation-of-obtaining-the-last-resu.patch Patch25: 0025-Adjusting-the-commit-off-setting-position.patch Patch26: 0026-Remove-excess-double-quotes-in-assoc-table.patch +Patch27: 0027-Adjusting-procedures.patch # build options .rpmmacros options change to default action # ==================== ==================== ======================== @@ -734,6 +735,9 @@ rm -rf %{buildroot} %systemd_postun_with_restart slurmdbd.service %changelog +* Fri May 24 2024 Xing Liu - 21.08.8-30 +- Adjusting procedures + * Thu May 23 2024 Xing Liu - 21.08.8-29 - Remove excess double quotes in assoc table