From 68ea5b112dc09a71a2298d7fe42329f8a266a477 Mon Sep 17 00:00:00 2001 From: motodiary Date: Fri, 24 May 2024 14:58:41 +0800 Subject: [PATCH] modify the field type of info in txn_table --- ...-the-field-type-of-info-in-txn_table.patch | 39 +++++++++++++++++++ slurm.spec | 6 ++- 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 0028-modify-the-field-type-of-info-in-txn_table.patch diff --git a/0028-modify-the-field-type-of-info-in-txn_table.patch b/0028-modify-the-field-type-of-info-in-txn_table.patch new file mode 100644 index 0000000..4f0b80c --- /dev/null +++ b/0028-modify-the-field-type-of-info-in-txn_table.patch @@ -0,0 +1,39 @@ +From 7778d6cd361b1b1e89a2bd2dc4f20ef58beeca13 Mon Sep 17 00:00:00 2001 +From: motodiary +Date: Fri, 24 May 2024 14:55:24 +0800 +Subject: [PATCH] modify the field type of info in txn_table + +--- + src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c | 2 +- + src/plugins/accounting_storage/pgsql/as_pgsql_jobacct_process.c | 2 +- + 2 files changed, 2 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 3da1cfa..40322fc 100755 +--- a/src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c ++++ b/src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c +@@ -562,7 +562,7 @@ static int _as_pgsql_acct_check_tables(pgsql_conn_t *pgsql_conn) + { "name", "text", "not null" }, + { "actor", "varchar", "not null" }, + { "cluster", "varchar", "default ''|not null" }, +- { "info", "bytea", "" }, ++ { "info", "text", "" }, + { NULL, NULL} + }; + +diff --git a/src/plugins/accounting_storage/pgsql/as_pgsql_jobacct_process.c b/src/plugins/accounting_storage/pgsql/as_pgsql_jobacct_process.c +index e7d650b..c15ef28 100755 +--- a/src/plugins/accounting_storage/pgsql/as_pgsql_jobacct_process.c ++++ b/src/plugins/accounting_storage/pgsql/as_pgsql_jobacct_process.c +@@ -1679,7 +1679,7 @@ extern int setup_job_cond_limits(slurmdb_job_cond_t *job_cond, + job_cond->usage_start); + else + xstrfmtcat(*extra, +- "(t1.time_eligible " ++ "(t1.time_eligible != 0" + "AND t1.time_eligible < %ld " + "AND (t1.time_end >= %ld " + "OR t1.time_end = 0)))", +-- +2.33.0 + diff --git a/slurm.spec b/slurm.spec index 3601f55..a0d2647 100644 --- a/slurm.spec +++ b/slurm.spec @@ -1,6 +1,6 @@ Name: slurm Version: 21.08.8 -%define rel 30 +%define rel 31 Release: %{rel}%{?dist} Summary: Slurm Workload Manager @@ -43,6 +43,7 @@ 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 +Patch28: 0028-modify-the-field-type-of-info-in-txn_table.patch # build options .rpmmacros options change to default action # ==================== ==================== ======================== @@ -735,6 +736,9 @@ rm -rf %{buildroot} %systemd_postun_with_restart slurmdbd.service %changelog +* Fri May 24 2024 Xing Liu - 21.08.8-31 +- modify the field type of info in txn_table + * Fri May 24 2024 Xing Liu - 21.08.8-30 - Adjusting procedures -- Gitee