From 82f2bdd9f409b6169a27d7b7929cea0dd6cbd29d Mon Sep 17 00:00:00 2001
From: motodiary <liu.xingb@h3c.com>
Date: Fri, 17 May 2024 09:23:38 +0800
Subject: [PATCH] update jobcomp_table field

Signed-off-by: motodiary <liu.xingb@h3c.com>
---
 0017-update-jobcomp_table-field.patch | 65 +++++++++++++++++++++++++++
 slurm.spec                            |  6 ++-
 2 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 0017-update-jobcomp_table-field.patch

diff --git a/0017-update-jobcomp_table-field.patch b/0017-update-jobcomp_table-field.patch
new file mode 100644
index 0000000..78db193
--- /dev/null
+++ b/0017-update-jobcomp_table-field.patch
@@ -0,0 +1,65 @@
+From aaba0a37d005ba967079599c387a2bcbb70bec0e Mon Sep 17 00:00:00 2001
+From: motodiary <liu.xingb@h3c.com>
+Date: Fri, 17 May 2024 09:19:37 +0800
+Subject: [PATCH] update jobcomp_table field
+
+---
+ src/plugins/jobcomp/pgsql/jobcomp_pgsql.c | 42 +++++++++++------------
+ 1 file changed, 21 insertions(+), 21 deletions(-)
+
+diff --git a/src/plugins/jobcomp/pgsql/jobcomp_pgsql.c b/src/plugins/jobcomp/pgsql/jobcomp_pgsql.c
+index 55db072..96aa8b7 100755
+--- a/src/plugins/jobcomp/pgsql/jobcomp_pgsql.c
++++ b/src/plugins/jobcomp/pgsql/jobcomp_pgsql.c
+@@ -77,27 +77,27 @@ pgsql_conn_t *jobcomp_pgsql_conn = NULL;
+ 
+ char *jobcomp_table = "jobcomp_table";
+ storage_field_t jobcomp_table_fields[] = {
+-    { "jobid", "int not null" },
+-    { "uid", "int unsigned not null" },
+-    { "user_name", "tinytext not null" },
+-    { "gid", "int unsigned not null" },
+-    { "group_name", "tinytext not null" },
+-    { "name", "tinytext not null" },
+-    { "state", "int unsigned not null" },
+-    { "partition", "tinytext not null" },
+-    { "timelimit", "tinytext not null" },
+-    { "starttime", "int unsigned default 0 not null" },
+-    { "endtime", "int unsigned default 0 not null" },
+-    { "nodelist", "text" },
+-    { "nodecnt", "int unsigned not null" },
+-    { "proc_cnt", "int unsigned not null" },
+-    { "connect_type", "tinytext" },
+-    { "reboot", "tinytext" },
+-    { "rotate", "tinytext" },
+-    { "maxprocs", "int unsigned default 0 not null" },
+-    { "geometry", "tinytext" },
+-    { "start", "tinytext" },
+-    { "blockid", "tinytext" },
++    { "jobid", "integer", "not null" },
++    { "uid", "integer", "not null" },
++    { "user_name", "varchar", "not null" },
++    { "gid", "integer", "not null" },
++    { "group_name", "varchar", "not null" },
++    { "name", "varchar", "not null" },
++    { "state", "integer", "not null" },
++    { "partition", "varchar", "not null" },
++    { "timelimit", "varchar", "not null" },
++    { "starttime", "integer", "default 0|not null" },
++    { "endtime", "integer", "default 0|not null" },
++    { "nodelist", "text", "" },
++    { "nodecnt", "integer", "not null" },
++    { "proc_cnt", "integer", "not null" },
++    { "connect_type", "varchar", "" },
++    { "reboot", "varchar", "" },
++    { "rotate", "varchar", "" },
++    { "maxprocs", "integer", "default 0|not null" },
++    { "geometry", "varchar", "" },
++    { "start", "varchar", "" },
++    { "blockid", "varchar", "" },
+     { NULL, NULL}
+ };
+ 
+-- 
+2.33.0
+
diff --git a/slurm.spec b/slurm.spec
index 2a97b8f..42da0fb 100644
--- a/slurm.spec
+++ b/slurm.spec
@@ -1,6 +1,6 @@
 Name:		slurm
 Version:	21.08.8
-%define rel	19
+%define rel	20
 Release:	%{rel}%{?dist}
 Summary:	Slurm Workload Manager
 
@@ -32,6 +32,7 @@ Patch13: 0013-fixed-the-partition-field-in-sql.patch
 Patch14: 0014-remove-FOR-UPDATE-in-sql.patch
 Patch15: 0015-fix-partition-conflict-in-tables.patch
 Patch16: 0016-resume-autocommit-off-option.patch
+Patch17: 0017-update-jobcomp_table-field.patch
 
 # build options		.rpmmacros options	change to default action
 # ====================  ====================	========================
@@ -724,6 +725,9 @@ rm -rf %{buildroot}
 %systemd_postun_with_restart slurmdbd.service
 
 %changelog
+* Fri May 17 2024 Xing Liu <liu.xingb@h3c.com> - 21.08.8-20
+- update jobcomp_table field
+
 * Thu May 16 2024 Xing Liu <liu.xingb@h3c.com> - 21.08.8-19
 - resume 'autocommit off' option
 
-- 
Gitee