From bfefb6230ece792cd256002fbb2f8c1da5699392 Mon Sep 17 00:00:00 2001 From: motodiary Date: Fri, 15 Mar 2024 06:49:44 +0800 Subject: [PATCH 1/2] support --oversubscribe in submit_job restapi --- ...-oversubscribe-in-submit_job-restapi.patch | 26 +++++++++++++++++++ slurm.spec | 3 ++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 0001-support-oversubscribe-in-submit_job-restapi.patch diff --git a/0001-support-oversubscribe-in-submit_job-restapi.patch b/0001-support-oversubscribe-in-submit_job-restapi.patch new file mode 100644 index 0000000..5047d84 --- /dev/null +++ b/0001-support-oversubscribe-in-submit_job-restapi.patch @@ -0,0 +1,26 @@ +From 89f5e47cb1cb0636d944996fbb976a786e000830 Mon Sep 17 00:00:00 2001 +From: motodiary +Date: Thu, 14 Mar 2024 10:06:48 +0800 +Subject: [PATCH] support --oversubscribe in submit_job restapi + +--- + src/plugins/openapi/v0.0.37/jobs.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/plugins/openapi/v0.0.37/jobs.c b/src/plugins/openapi/v0.0.37/jobs.c +index e5e5030..b925846 100644 +--- a/src/plugins/openapi/v0.0.37/jobs.c ++++ b/src/plugins/openapi/v0.0.37/jobs.c +@@ -181,7 +181,8 @@ const params_t job_params[] = { + { "no_shell", LONG_OPT_NO_SHELL, true }, + { "open_mode", LONG_OPT_OPEN_MODE }, + { "overcommit", 'O', true }, +- { "oversubscribe", 's', true }, ++ /* to support --oversubscribe in submit_job restapi */ ++ { "oversubscribe", 's'}, + { "hetjob_group", LONG_OPT_HET_GROUP, true }, + { "parsable", LONG_OPT_PARSABLE, true }, + { "partition", 'p' }, +-- +2.33.0 + diff --git a/slurm.spec b/slurm.spec index 49380cb..81322ff 100644 --- a/slurm.spec +++ b/slurm.spec @@ -16,6 +16,7 @@ URL: https://slurm.schedmd.com/ %endif Source: %{slurm_source_dir}.tar.bz2 +Patch1: 0001-support-oversubscribe-in-submit_job-restapi.patch # build options .rpmmacros options change to default action # ==================== ==================== ======================== @@ -333,7 +334,7 @@ notifies slurm about failed nodes. %prep # when the rel number is one, the tarball filename does not include it -%setup -n %{slurm_source_dir} +%autosetup -n %{slurm_source_dir} -p1 %build %configure \ -- Gitee From 370e462806b0523d492dc5f3e7b8c9cfbcee51fa Mon Sep 17 00:00:00 2001 From: motodiary Date: Fri, 15 Mar 2024 07:41:56 +0800 Subject: [PATCH 2/2] modify changelog in slurm.spec --- slurm.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/slurm.spec b/slurm.spec index 81322ff..d1c1565 100644 --- a/slurm.spec +++ b/slurm.spec @@ -1,6 +1,6 @@ Name: slurm Version: 21.08.8 -%define rel 2 +%define rel 3 Release: %{rel}%{?dist} Summary: Slurm Workload Manager @@ -694,6 +694,9 @@ rm -rf %{buildroot} %systemd_postun_with_restart slurmdbd.service %changelog -* Sat May 07 2022 Bruce Ma +* Wed Mar 15 2024 Xing Liu - 21.08.8-3 +- support '--oversubscribe' attribute in submit_job restapi. + +* Sat May 07 2022 Bruce Ma - 21.08.8-2 - Init package slurm-2.1.08.8-2 . -- Gitee