diff --git a/0050-enable-col_data-empty-check.patch b/0050-enable-col_data-empty-check.patch new file mode 100644 index 0000000000000000000000000000000000000000..c879e95c319c075b8f2c79c4a98953dcbb355d6c --- /dev/null +++ b/0050-enable-col_data-empty-check.patch @@ -0,0 +1,31 @@ +From b8e7e2492f69fb0506b03eb159577b3f149d6da7 Mon Sep 17 00:00:00 2001 +From: motodiary +Date: Mon, 17 Jun 2024 09:45:36 +0800 +Subject: [PATCH] enable col_data empty check + +--- + src/database/pgsql_common.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/database/pgsql_common.c b/src/database/pgsql_common.c +index d280d08..2987bba 100755 +--- a/src/database/pgsql_common.c ++++ b/src/database/pgsql_common.c +@@ -1624,10 +1624,10 @@ extern uint64_t pgsql_insert_id(SQLHSTMT stmt) + + if(SQLFetch(stmt) != SQL_NO_DATA){ + PGSQL_GET_TEXT_DATA(stmt, 0, col_data, rc); +-// if (col_data == NULL) { +-// error("%s get insert id failed", __func__); +-// return 0; +-// } ++ if (col_data == NULL) { ++ error("%s get insert id failed", __func__); ++ return 0; ++ } + last_id = slurm_atoull(col_data); + xfree(col_data); + return last_id; +-- +2.33.0 + diff --git a/slurm.spec b/slurm.spec index 4b9ebf283ff41c5aeb1578f12506355b392e2e82..908f4379baaf4d3a3c7f4f101dc6b5d8d74b8028 100644 --- a/slurm.spec +++ b/slurm.spec @@ -1,6 +1,6 @@ Name: slurm Version: 21.08.8 -%define rel 52 +%define rel 53 Release: %{rel}%{?dist} Summary: Slurm Workload Manager @@ -65,6 +65,7 @@ Patch46: 0046-Add-empty-check-and-inline-in-set_autocommit_off.patch Patch47: 0047-rename-_get_result_by_index.patch Patch48: 0048-fix-sacct-not-showing-job-information.patch Patch49: 0049-fix-the-preempt-error.patch +Patch50: 0050-enable-col_data-empty-check.patch # build options .rpmmacros options change to default action # ==================== ==================== ======================== @@ -757,6 +758,9 @@ rm -rf %{buildroot} %systemd_postun_with_restart slurmdbd.service %changelog +* Mon Jun 17 2024 Xing Liu - 21.08.8-53 +- enable col_data empty check + * Fri Jun 14 2024 Xing Liu - 21.08.8-52 - fix the preempt error