diff --git a/0020-replace-UNIX_TIMESTAMP-in-sql.patch b/0020-replace-UNIX_TIMESTAMP-in-sql.patch new file mode 100644 index 0000000000000000000000000000000000000000..ce995e7277435ddd6e90d66bbb31cacaeed9b3d2 --- /dev/null +++ b/0020-replace-UNIX_TIMESTAMP-in-sql.patch @@ -0,0 +1,48 @@ +From 344200cbead0981b3dd350759e284f5305197548 Mon Sep 17 00:00:00 2001 +From: motodiary +Date: Mon, 20 May 2024 14:40:41 +0800 +Subject: [PATCH] replace UNIX_TIMESTAMP in sql + +--- + src/plugins/accounting_storage/pgsql/as_pgsql_convert.c | 2 +- + src/plugins/accounting_storage/pgsql/as_pgsql_job.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/plugins/accounting_storage/pgsql/as_pgsql_convert.c b/src/plugins/accounting_storage/pgsql/as_pgsql_convert.c +index 6c34e82..1f1acdc 100755 +--- a/src/plugins/accounting_storage/pgsql/as_pgsql_convert.c ++++ b/src/plugins/accounting_storage/pgsql/as_pgsql_convert.c +@@ -326,7 +326,7 @@ extern int as_pgsql_convert_non_cluster_tables_post_create( + + if (rc == SLURM_SUCCESS) { + char *query = xstrdup_printf( +- "update %s set version=%d, mod_time=UNIX_TIMESTAMP()", ++ "update %s set version=%d, mod_time=floor(extract(epoch from now()))", + convert_version_table, CONVERT_VERSION); + + info("Conversion done: success!"); +diff --git a/src/plugins/accounting_storage/pgsql/as_pgsql_job.c b/src/plugins/accounting_storage/pgsql/as_pgsql_job.c +index 7d1e1fa..7d734e0 100755 +--- a/src/plugins/accounting_storage/pgsql/as_pgsql_job.c ++++ b/src/plugins/accounting_storage/pgsql/as_pgsql_job.c +@@ -516,7 +516,7 @@ no_rollup_change: + xstrcat(query, ", container"); + + xstrfmtcat(query, +- ") values (%u, UNIX_TIMESTAMP(), " ++ ") values (%u, floor(extract(epoch from now())), " + "%u, %u, %u, %u, %u, %u, %u, %u, " + "'%s', %u, %u, %ld, %ld, %ld, " + "'%s', %u, %u, %u, %u, %u, %"PRIu64", %u, %u", +@@ -585,7 +585,7 @@ no_rollup_change: + "id_assoc=%u, id_user=%u, id_group=%u, " + "nodelist='%s', id_resv=%u, timelimit=%u, " + "time_submit=%ld, time_eligible=%ld, " +- "time_start=%ld, mod_time=UNIX_TIMESTAMP(), " ++ "time_start=%ld, mod_time=floor(extract(epoch from now())), " + "job_name='%s', track_steps=%u, id_qos=%u, " + "state=GREATEST(state, %u), priority=%u, " + "cpus_req=%u, nodes_alloc=%u, " +-- +2.33.0 + diff --git a/slurm.spec b/slurm.spec index 0e7370df15b1faca78b29c5795096e5ac95b7011..0bd1b946219efd5aeb644852cdb1bd7d1c21203f 100644 --- a/slurm.spec +++ b/slurm.spec @@ -1,6 +1,6 @@ Name: slurm Version: 21.08.8 -%define rel 22 +%define rel 23 Release: %{rel}%{?dist} Summary: Slurm Workload Manager @@ -35,6 +35,7 @@ Patch16: 0016-resume-autocommit-off-option.patch 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 # build options .rpmmacros options change to default action # ==================== ==================== ======================== @@ -727,6 +728,9 @@ rm -rf %{buildroot} %systemd_postun_with_restart slurmdbd.service %changelog +* Mon May 20 2024 Xing Liu - 21.08.8-23 +- replace UNIX_TIMESTAMP in sql + * Mon May 20 2024 Xing Liu - 21.08.8-22 - Adjusting some SQL statements