diff --git a/0025-Adjusting-the-commit-off-setting-position.patch b/0025-Adjusting-the-commit-off-setting-position.patch new file mode 100644 index 0000000000000000000000000000000000000000..fed0e021e408c1425f23bfd4f2a03e97075898db --- /dev/null +++ b/0025-Adjusting-the-commit-off-setting-position.patch @@ -0,0 +1,38 @@ +From 82012852827a776c693afabdde0409347077b48d Mon Sep 17 00:00:00 2001 +From: motodiary +Date: Thu, 23 May 2024 10:02:54 +0800 +Subject: [PATCH] Adjusting the commit off setting position + +--- + src/database/pgsql_common.c | 1 + + src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/database/pgsql_common.c b/src/database/pgsql_common.c +index 16d3315..c2f29d6 100755 +--- a/src/database/pgsql_common.c ++++ b/src/database/pgsql_common.c +@@ -1008,6 +1008,7 @@ extern int pgsql_db_get_db_connection(pgsql_conn_t *pgsql_conn, char *db_name, + } + SQLSetConnectAttr(pgsql_conn->db_conn, SQL_LOGIN_TIMEOUT, (SQLPOINTER*)5, 0); + SQLSetConnectAttr(pgsql_conn->db_conn, SQL_ATTR_CONNECTION_TIMEOUT, (SQLPOINTER)&my_timeout, 0); ++ set_autocommit_off(pgsql_conn); + + while (!storage_init) { + debug2("Attempting to connect to %s:%d", db_host, db_info->port); +diff --git a/src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c b/src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c +index 7e0d57c..34882a5 100755 +--- a/src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c ++++ b/src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c +@@ -2546,7 +2546,7 @@ extern int init(void) + + rc = _as_pgsql_acct_check_tables(pgsql_conn); + +- set_autocommit_off(pgsql_conn); ++ //set_autocommit_off(pgsql_conn); + + if (rc == SLURM_SUCCESS) { + if (pgsql_db_commit(pgsql_conn)) { +-- +2.33.0 + diff --git a/slurm.spec b/slurm.spec index 849022c4f0a6e13f8c501a18dbe2e53cf1e4d599..a67926256c0fca7e2518f21b0d1f7ad73fcad05a 100644 --- a/slurm.spec +++ b/slurm.spec @@ -1,6 +1,6 @@ Name: slurm Version: 21.08.8 -%define rel 27 +%define rel 28 Release: %{rel}%{?dist} Summary: Slurm Workload Manager @@ -40,6 +40,7 @@ Patch21: 0021-fix-user-and-partition-field-in-sql.patch Patch22: 0022-add-SQLRowCount-exception-handling.patch 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 # build options .rpmmacros options change to default action # ==================== ==================== ======================== @@ -732,6 +733,9 @@ rm -rf %{buildroot} %systemd_postun_with_restart slurmdbd.service %changelog +* Thu May 23 2024 Xing Liu - 21.08.8-28 +- Adjusting the commit off setting position + * Wed May 22 2024 Xing Liu - 21.08.8-27 - update the implementation of obtaining the last result set