pool/slurm
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 591864 from network:cluster

Browse Source 
- fixed wrong log file location in slurmdbd.conf and 
  fixed pid location for slurmdbd and made slurm-slurmdbd
  depend on slurm config which provides the dir /var/run/slurm
  (bsc#1086859) (forwarded request 591103 from mslacken)

OBS-URL: https://build.opensuse.org/request/show/591864
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/slurm?expand=0&rev=11
This commit is contained in:
Dominique Leuenberger 2018-03-29 09:57:05 +00:00 committed by Git OBS Bridge
commit 3297ea57b6
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
slurm.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Fri Mar 23 13:50:14 UTC 2018 - cgoll@suse.com
- fixed wrong log file location in slurmdbd.conf and
fixed pid location for slurmdbd and made slurm-slurmdbd
depend on slurm config which provides the dir /var/run/slurm
(bsc#1086859)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 16 08:57:20 UTC 2018 - cgoll@suse.com Fri Mar 16 08:57:20 UTC 2018 - cgoll@suse.com

13
slurm.spec
View File

@ -61,7 +61,7 @@ Release: 0
Summary: Simple Linux Utility for Resource Management Summary: Simple Linux Utility for Resource Management
License: SUSE-GPL-2.0-with-openssl-exception License: SUSE-GPL-2.0-with-openssl-exception
Group: Productivity/Clustering/Computing Group: Productivity/Clustering/Computing
Url: https://computing.llnl.gov/linux/slurm/ Url: https://www.schedmd.com
Source: https://download.schedmd.com/slurm/%{name}-%{ver}.tar.bz2 Source: https://download.schedmd.com/slurm/%{name}-%{ver}.tar.bz2
Source1: slurm-rpmlintrc Source1: slurm-rpmlintrc
Patch0: slurm-2.4.4-rpath.patch Patch0: slurm-2.4.4-rpath.patch
@ -198,6 +198,7 @@ jobs, partitions, and nodes managed by SLURM.
%package slurmdbd %package slurmdbd
Summary: SLURM database daemon Summary: SLURM database daemon
Group: Productivity/Clustering/Computing Group: Productivity/Clustering/Computing
Requires: slurm-config = %{version}
Requires: slurm-plugins = %{version} Requires: slurm-plugins = %{version}
%if 0%{?with_systemd} %if 0%{?with_systemd}
%{?systemd_requires} %{?systemd_requires}
@ -366,10 +367,7 @@ install -D -m755 contribs/sjstat %{buildroot}%{_bindir}/sjstat
install -D -m755 contribs/sgather/sgather %{buildroot}%{_bindir}/sgather install -D -m755 contribs/sgather/sgather %{buildroot}%{_bindir}/sgather
%if 0%{?OHPC_BUILD} %if 0%{?OHPC_BUILD}
# 6/16/15 karl.w.schulz@intel.com - do not package Slurm's version of libpmi with OpenHPC. # change slurm.conf for our needs
## rm -f %%{buildroot}/%%{_libdir}/libpmi*
## rm -f %%{buildroot}/%%{_libdir}/mpi_pmi2*
# 9/8/14 karl.w.schulz@intel.com - provide starting config file
head -n -2 %{buildroot}/%{_sysconfdir}/%{name}/slurm.conf.example | grep -v ReturnToService > %{buildroot}/%{_sysconfdir}/%{name}/slurm.conf head -n -2 %{buildroot}/%{_sysconfdir}/%{name}/slurm.conf.example | grep -v ReturnToService > %{buildroot}/%{_sysconfdir}/%{name}/slurm.conf
sed -i 's#\(StateSaveLocation=\).*#\1%_localstatedir/lib/slurm#' %{buildroot}/%{_sysconfdir}/%{name}/slurm.conf sed -i 's#\(StateSaveLocation=\).*#\1%_localstatedir/lib/slurm#' %{buildroot}/%{_sysconfdir}/%{name}/slurm.conf
sed -i 's#^\(SlurmdPidFile=\).*$#\1%{_localstatedir}/run/slurm/slurmd.pid#' %{buildroot}/%{_sysconfdir}/%{name}/slurm.conf sed -i 's#^\(SlurmdPidFile=\).*$#\1%{_localstatedir}/run/slurm/slurmd.pid#' %{buildroot}/%{_sysconfdir}/%{name}/slurm.conf
@ -385,9 +383,14 @@ PartitionName=normal Nodes=linux Default=YES MaxTime=24:00:00 State=UP
EOF EOF
# 9/17/14 karl.w.schulz@intel.com - Add option to drop VM cache during epilog # 9/17/14 karl.w.schulz@intel.com - Add option to drop VM cache during epilog
sed -i '/^# No other SLURM jobs,/i \\n# Drop clean caches (OpenHPC)\necho 3 > /proc/sys/vm/drop_caches\n\n#' %{buildroot}/%{_sysconfdir}/%{name}/slurm.epilog.clean sed -i '/^# No other SLURM jobs,/i \\n# Drop clean caches (OpenHPC)\necho 3 > /proc/sys/vm/drop_caches\n\n#' %{buildroot}/%{_sysconfdir}/%{name}/slurm.epilog.clean
# chnage slurmdbd.conf for our needs
sed -i 's@LogFile=/var/log/slurm/slurmdbd.log@LogFile=/var/log/slurmdbd.log@' %{buildroot}/%{_sysconfdir}/%{name}/slurmdbd.conf
sed -i -e "s@PidFile=.*@PidFile=%{_localstatedir}/run/slurm/slurmdbd.pid@" %{buildroot}/%{_sysconfdir}/%{name}/slurmdbd.conf
# manage local state dir
mkdir -p %{buildroot}/%_localstatedir/lib/slurm mkdir -p %{buildroot}/%_localstatedir/lib/slurm
sed -i -e "s@PIDFile=.*@PIDFile=%{_localstatedir}/run/slurm/slurmctld.pid@" %{buildroot}/%{_unitdir}/slurmctld.service sed -i -e "s@PIDFile=.*@PIDFile=%{_localstatedir}/run/slurm/slurmctld.pid@" %{buildroot}/%{_unitdir}/slurmctld.service
sed -i -e "s@PIDFile=.*@PIDFile=%{_localstatedir}/run/slurm/slurmd.pid@" %{buildroot}/%{_unitdir}/slurmd.service 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@" %{buildroot}/%{_unitdir}/slurmdbd.service
%endif %endif
# Delete unpackaged files: # Delete unpackaged files: