From 5f567520bdcc59fbb9427a3e2edc64a297f3cf97 Mon Sep 17 00:00:00 2001 From: motodiary Date: Wed, 22 May 2024 10:53:06 +0800 Subject: [PATCH] modify step table --- 0023-modify-step-table.patch | 57 ++++++++++++++++++++++++++++++++++++ slurm.spec | 6 +++- 2 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 0023-modify-step-table.patch diff --git a/0023-modify-step-table.patch b/0023-modify-step-table.patch new file mode 100644 index 0000000..ffbe3ca --- /dev/null +++ b/0023-modify-step-table.patch @@ -0,0 +1,57 @@ +From c87c35d0e0fc11cfa5e1d8057f03aefc47877c88 Mon Sep 17 00:00:00 2001 +From: motodiary +Date: Wed, 22 May 2024 10:34:20 +0800 +Subject: [PATCH] modify step table + +--- + .../pgsql/accounting_storage_pgsql.c | 22 +++++++++---------- + 1 file changed, 11 insertions(+), 11 deletions(-) + +diff --git a/src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c b/src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c +index 1bcb2df..7e0d57c 100755 +--- a/src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c ++++ b/src/plugins/accounting_storage/pgsql/accounting_storage_pgsql.c +@@ -1287,29 +1287,29 @@ extern int create_cluster_tables(pgsql_conn_t *pgsql_conn, char *cluster_name) + { "job_db_inx", "bigint", "not null" }, + { "deleted", "smallint", "default 0" }, + { "exit_code", "integer", "default 0|not null" }, +- { "id_step", "integer", "not null" }, +- { "step_het_comp", "integer", "default 4294967294|not null" }, +- { "kill_requid", "integer", "default -1|not null" }, ++ { "id_step", "bigint", "not null" }, ++ { "step_het_comp", "bigint", "default 4294967294|not null" }, ++ { "kill_requid", "bigint", "default -1|not null" }, + { "nodelist", "text", "not null" }, +- { "nodes_alloc", "integer", "not null" }, ++ { "nodes_alloc", "bigint", "not null" }, + { "node_inx", "text", "" }, + { "state", "smallint", "not null" }, + { "step_name", "text", "not null" }, +- { "task_cnt", "integer", "not null" }, +- { "task_dist", "integer", "default 0|not null" }, ++ { "task_cnt", "bigint", "not null" }, ++ { "task_dist", "bigint", "default 0|not null" }, + { "time_start", "bigint", "default 0|not null" }, + { "time_end", "bigint", "default 0|not null" }, + { "time_suspended", "bigint", "default 0|not null" }, + { "user_sec", "bigint", "default 0|not null" }, +- { "user_usec", "integer", "default 0|not null" }, ++ { "user_usec", "bigint", "default 0|not null" }, + { "sys_sec", "bigint", "default 0|not null" }, +- { "sys_usec", "integer", "default 0|not null" }, ++ { "sys_usec", "bigint", "default 0|not null" }, + { "act_cpufreq", "double precision", "default 0.0|not null" }, + { "consumed_energy", "bigint", "default 0|not null" }, + { "container", "text", "" }, +- { "req_cpufreq_min", "integer", "default 0|not null" }, +- { "req_cpufreq", "integer", "default 0|not null" }, +- { "req_cpufreq_gov", "integer", "default 0|not null" }, ++ { "req_cpufreq_min", "bigint", "default 0|not null" }, ++ { "req_cpufreq", "bigint", "default 0|not null" }, ++ { "req_cpufreq_gov", "bigint", "default 0|not null" }, + { "submit_line", "text", "" }, + { "tres_alloc", "text", "not null|default ''" }, + { "tres_usage_in_ave", "text", "not null|default ''" }, +-- +2.33.0 + diff --git a/slurm.spec b/slurm.spec index 1cd9e96..f25147f 100644 --- a/slurm.spec +++ b/slurm.spec @@ -1,6 +1,6 @@ Name: slurm Version: 21.08.8 -%define rel 25 +%define rel 26 Release: %{rel}%{?dist} Summary: Slurm Workload Manager @@ -38,6 +38,7 @@ Patch19: 0019-Adjusting-some-SQL-statements.patch Patch20: 0020-replace-UNIX_TIMESTAMP-in-sql.patch Patch21: 0021-fix-user-and-partition-field-in-sql.patch Patch22: 0022-add-SQLRowCount-exception-handling.patch +Patch23: 0023-modify-step-table.patch # build options .rpmmacros options change to default action # ==================== ==================== ======================== @@ -730,6 +731,9 @@ rm -rf %{buildroot} %systemd_postun_with_restart slurmdbd.service %changelog +* Wed May 22 2024 Xing Liu - 21.08.8-26 +- modify step table + * Tue May 21 2024 Xing Liu - 21.08.8-25 - add SQLRowCount exception handling -- Gitee