From 995841bad47956ded65727d4ba499cdde95537d286bc685c2de0328a93b4ceb6 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Thu, 23 Jan 2020 17:49:33 +0000 Subject: [PATCH 1/3] Accepting request 766677 from home:mslacken:branches:network:cluster - start slurmdbd after mariabd (bsc#1161716) OBS-URL: https://build.opensuse.org/request/show/766677 OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=122 --- slurm.changes | 5 +++++ slurm.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/slurm.changes b/slurm.changes index 68b6b18..87a7d09 100644 --- a/slurm.changes +++ b/slurm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jan 23 17:44:29 UTC 2020 - Christian Goll + +- start slurmdbd after mariabd (bsc#1161716) + ------------------------------------------------------------------- Mon Jan 13 15:41:48 UTC 2020 - Egbert Eich diff --git a/slurm.spec b/slurm.spec index 2f141d1..14c8edb 100644 --- a/slurm.spec +++ b/slurm.spec @@ -610,6 +610,7 @@ sed -i -e "s@PIDFile=.*@PIDFile=%{_localstatedir}/run/slurm/slurmctld.pid@" \ sed -i -e "s@PIDFile=.*@PIDFile=%{_localstatedir}/run/slurm/slurmd.pid@" \ %{buildroot}/%{_unitdir}/slurmd.service sed -i -e "s@PIDFile=.*@PIDFile=%{_localstatedir}/run/slurm/slurmdbd.pid@" \ + -e 's@After=\(.*\)@After=\1 mariadb.service@' \ %{buildroot}/%{_unitdir}/slurmdbd.service %endif From 345d1bbb94dc6c2aeb7038df90cd6500135374b338752e903b9dd458b33b1f39 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 24 Jan 2020 17:12:50 +0000 Subject: [PATCH 2/3] Accepting request 766872 from home:dimstar:Factory - BuildRequire pkgconfig(systemd) instead of systemd: allow OBS to shortcut through the -mini flavors. - Use systemd_ordering instead of systemd_requires: systemd is never a strict requirement; but in case the system is scheduled for installation together with systemd, we want systemd to be installed prior to slurm. - start slurmdbd after mariadb (bsc#1161716) OBS-URL: https://build.opensuse.org/request/show/766872 OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=123 --- slurm.changes | 12 +++++++++++- slurm.spec | 8 ++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/slurm.changes b/slurm.changes index 87a7d09..5e4691f 100644 --- a/slurm.changes +++ b/slurm.changes @@ -1,7 +1,17 @@ +------------------------------------------------------------------- +Fri Jan 24 11:47:58 UTC 2020 - Dominique Leuenberger + +- BuildRequire pkgconfig(systemd) instead of systemd: allow OBS to + shortcut through the -mini flavors. +- Use systemd_ordering instead of systemd_requires: systemd is + never a strict requirement; but in case the system is scheduled + for installation together with systemd, we want systemd to be + installed prior to slurm. + ------------------------------------------------------------------- Thu Jan 23 17:44:29 UTC 2020 - Christian Goll -- start slurmdbd after mariabd (bsc#1161716) +- start slurmdbd after mariadb (bsc#1161716) ------------------------------------------------------------------- Mon Jan 13 15:41:48 UTC 2020 - Egbert Eich diff --git a/slurm.spec b/slurm.spec index 14c8edb..d158ac4 100644 --- a/slurm.spec +++ b/slurm.spec @@ -187,7 +187,7 @@ BuildRequires: libssh2-devel BuildRequires: rrdtool-devel %if 0%{?with_systemd} %{?systemd_requires} -BuildRequires: systemd +BuildRequires: pkgconfig(systemd) %else Requires(post): %insserv_prereq %fillup_prereq %endif @@ -330,7 +330,7 @@ Recommends: (%{name}-munge = %version if munge) Recommends: %{name}-munge = %version %endif %if 0%{?with_systemd} -%{?systemd_requires} +%{?systemd_ordering} %else Requires(post): %insserv_prereq %fillup_prereq %endif @@ -449,7 +449,7 @@ Recommends: (%{name}-munge = %version if munge) Recommends: %{name}-munge = %version %endif %if 0%{?with_systemd} -%{?systemd_requires} +%{?systemd_ordering} %else Requires(post): %insserv_prereq %fillup_prereq %endif @@ -469,7 +469,7 @@ Requires(pre): pwdutils Requires(pre): shadow %endif %if 0%{?with_systemd} -%{?systemd_requires} +%{?systemd_ordering} %endif %{?upgrade:Provides: %{pname}-config = %{version}} %{?upgrade:Conflicts: %{pname}-config} From 73e298f12fd74eb41a4d90977835f3d716aae864878ba39f228f06b99fa2b3fb Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Sat, 25 Jan 2020 06:14:47 +0000 Subject: [PATCH 3/3] Accepting request 767005 from home:eeich:branches:network:cluster - Remove special OHPC compatibility macro: these settings should be applied univerally. - Add a Recommends for mariadb to slurm-slurmdbd: it is recommened to run the database on the same machine as the daemon. OBS-URL: https://build.opensuse.org/request/show/767005 OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=124 --- slurm.changes | 8 ++++++++ slurm.spec | 16 +++++++--------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/slurm.changes b/slurm.changes index 5e4691f..1d0215b 100644 --- a/slurm.changes +++ b/slurm.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Jan 24 17:31:18 UTC 2020 - Egbert Eich + +- Remove special OHPC compatibility macro: these settings should + be applied univerally. +- Add a Recommends for mariadb to slurm-slurmdbd: it is recommened + to run the database on the same machine as the daemon. + ------------------------------------------------------------------- Fri Jan 24 11:47:58 UTC 2020 - Dominique Leuenberger diff --git a/slurm.spec b/slurm.spec index d158ac4..39329ee 100644 --- a/slurm.spec +++ b/slurm.spec @@ -58,11 +58,6 @@ ExclusiveArch: do_not_build %{bcond_with pmix} %endif -# For anything newer than Leap 42.1 and SLE-12-SP1 build compatible to OpenHPC. -%if 0%{suse_version} > 1320 || 0%{?sle_version} >= 120200 -%define OHPC_BUILD 1 -%endif - %if 0%{?suse_version} >= 1220 || 0%{?sle_version} >= 120000 %define with_systemd 1 %endif @@ -324,6 +319,9 @@ Group: Productivity/Clustering/Computing Requires: %{name}-config = %{version} Requires: %{name}-plugins = %{version} Requires: %{name}-sql = %{version} +%if 0%{?suse_version} > 1310 +Recommends: mariadb +%endif %if 0%{?have_boolean_deps} Recommends: (%{name}-munge = %version if munge) %else @@ -569,7 +567,7 @@ install -D -m644 etc/cgroup.conf.example %{buildroot}/%{_sysconfdir}/%{pname}/cg install -D -m644 etc/layouts.d.power.conf.example %{buildroot}/%{_sysconfdir}/%{pname}/layouts.d/power.conf.example install -D -m644 etc/layouts.d.power_cpufreq.conf.example %{buildroot}/%{_sysconfdir}/%{pname}/layouts.d/power_cpufreq.conf.example install -D -m644 etc/layouts.d.unit.conf.example %{buildroot}/%{_sysconfdir}/%{pname}/layouts.d/unit.conf.example -install -D -m644 etc/slurm.conf.example %{buildroot}/%{_sysconfdir}/%{pname}/slurm.conf%{?OHPC_BUILD:.example} +install -D -m644 etc/slurm.conf.example %{buildroot}/%{_sysconfdir}/%{pname}/slurm.conf.example install -D -m600 etc/slurmdbd.conf.example %{buildroot}/%{_sysconfdir}/%{pname}/slurmdbd.conf install -D -m600 etc/slurmdbd.conf.example %{buildroot}%{_sysconfdir}/%{pname}/slurmdbd.conf.example install -D -m755 contribs/sjstat %{buildroot}%{_bindir}/sjstat @@ -577,7 +575,6 @@ install -D -m755 contribs/sgather/sgather %{buildroot}%{_bindir}/sgather cp contribs/pam_slurm_adopt/README ../README.pam_slurm_adopt cp contribs/pam/README ../README.pam_slurm -%if 0%{?OHPC_BUILD} # change slurm.conf for our needs head -n -2 %{buildroot}/%{_sysconfdir}/%{pname}/slurm.conf.example | grep -v ReturnToService > %{buildroot}/%{_sysconfdir}/%{pname}/slurm.conf sed -i 's#\(StateSaveLocation=\).*#\1%_localstatedir/lib/slurm#' %{buildroot}/%{_sysconfdir}/%{pname}/slurm.conf @@ -604,6 +601,7 @@ sed -i -e "s@PidFile=.*@PidFile=%{_localstatedir}/run/slurm/slurmdbd.pid@" \ %{buildroot}/%{_sysconfdir}/%{pname}/slurmdbd.conf # manage local state dir and a remote states save location mkdir -p %{buildroot}/%_localstatedir/lib/slurm +%if 0%{?with_systemd} sed -i -e "s@PIDFile=.*@PIDFile=%{_localstatedir}/run/slurm/slurmctld.pid@" \ -e "s@After=.*@After=network.target munge.service remote-fs.target@" \ %{buildroot}/%{_unitdir}/slurmctld.service @@ -1182,12 +1180,12 @@ exit 0 %dir %{_sysconfdir}/%{pname} %dir %{_sysconfdir}/%{pname}/layouts.d %config(noreplace) %{_sysconfdir}/%{pname}/slurm.conf -%{?OHPC_BUILD:%config %{_sysconfdir}/%{pname}/slurm.conf.example} +%config %{_sysconfdir}/%{pname}/slurm.conf.example %config(noreplace) %{_sysconfdir}/%{pname}/cgroup.conf %config(noreplace) %{_sysconfdir}/%{pname}/layouts.d/power.conf.example %config(noreplace) %{_sysconfdir}/%{pname}/layouts.d/power_cpufreq.conf.example %config(noreplace) %{_sysconfdir}/%{pname}/layouts.d/unit.conf.example -%{?OHPC_BUILD:%attr(0755, %slurm_u, %slurm_g) %_localstatedir/lib/slurm} +%attr(0755, %slurm_u, %slurm_g) %_localstatedir/lib/slurm %{?with_systemd:%{_tmpfilesdir}/%{pname}.conf} %dir %attr(0755, %slurm_u, %slurm_g)%{_localstatedir}/spool/slurm %config(noreplace) %{_sysconfdir}/logrotate.d/slurm*