From 63d5c47eb11a7e3139a078944a8abb199203e520c3a8bdcd46781488b900fcd1 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Wed, 26 Feb 2020 11:12:32 +0000 Subject: [PATCH] Accepting request 779379 from home:eeich:branches:network:cluster - Update to version 20.02.0 (jsc#SLE-8491) * Fix minor memory leak in slurmd on reconfig. * Fix invalid ptr reference when rolling up data in the database. * Change shtml2html.py to require python3 for RHEL8 support, and match man2html.py. * slurm.spec - override "hardening" linker flags to ensure RHEL8 builds in a usable manner. * Fix type mismatches in the perl API. * Prevent use of uninitialized slurmctld_diag_stats. * Fixed various Coverity issues. * Only show warning about root-less topology in daemons. * Fix accounting of jobs in IGNORE_JOBS reservations. * Fix issue with batch steps state not loading correctly when upgrading from 19.05. * Deprecate max_depend_depth in SchedulerParameters and move it to DependencyParameters. * Silence erroneous error on slurmctld upgrade when loading federation state. * Break infinite loop in cons_tres dealing with incorrect tasks per tres request resulting in slurmctld hang. * Improve handling of --gpus-per-task to make sure appropriate number of GPUs is assigned to job. * Fix seg fault on cons_res when requesting --spread-job. - Move to python3 for everything but SLE-11-SP4 * For SLE-11-SP4 add a workaround to handle a python3 script (python2.7 compliant). OBS-URL: https://build.opensuse.org/request/show/779379 OBS-URL: https://build.opensuse.org/package/show/network:cluster/slurm?expand=0&rev=136 --- slurm-20.02.0-0rc1.tar.bz2 | 3 --- slurm-20.02.0.tar.bz2 | 3 +++ slurm.changes | 29 +++++++++++++++++++++++++++++ slurm.spec | 12 ++++++++++-- 4 files changed, 42 insertions(+), 5 deletions(-) delete mode 100644 slurm-20.02.0-0rc1.tar.bz2 create mode 100644 slurm-20.02.0.tar.bz2 diff --git a/slurm-20.02.0-0rc1.tar.bz2 b/slurm-20.02.0-0rc1.tar.bz2 deleted file mode 100644 index 622ea97..0000000 --- a/slurm-20.02.0-0rc1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:467a1348cb46d87965bd87acf7b53e00bb443cc032a1415fa14e91b2e970f926 -size 6298529 diff --git a/slurm-20.02.0.tar.bz2 b/slurm-20.02.0.tar.bz2 new file mode 100644 index 0000000..6d68ea4 --- /dev/null +++ b/slurm-20.02.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:45213362e3cc7f37e4ea64f3b2b1e3ce8f9c1c5c32a18d50ddb56280ec585ebb +size 6297730 diff --git a/slurm.changes b/slurm.changes index 0370944..b8b7940 100644 --- a/slurm.changes +++ b/slurm.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Wed Feb 26 06:13:13 UTC 2020 - Egbert Eich + +- Update to version 20.02.0 (jsc#SLE-8491) + * Fix minor memory leak in slurmd on reconfig. + * Fix invalid ptr reference when rolling up data in the database. + * Change shtml2html.py to require python3 for RHEL8 support, and match + man2html.py. + * slurm.spec - override "hardening" linker flags to ensure RHEL8 builds + in a usable manner. + * Fix type mismatches in the perl API. + * Prevent use of uninitialized slurmctld_diag_stats. + * Fixed various Coverity issues. + * Only show warning about root-less topology in daemons. + * Fix accounting of jobs in IGNORE_JOBS reservations. + * Fix issue with batch steps state not loading correctly when upgrading from + 19.05. + * Deprecate max_depend_depth in SchedulerParameters and move it to + DependencyParameters. + * Silence erroneous error on slurmctld upgrade when loading federation state. + * Break infinite loop in cons_tres dealing with incorrect tasks per tres + request resulting in slurmctld hang. + * Improve handling of --gpus-per-task to make sure appropriate number of GPUs + is assigned to job. + * Fix seg fault on cons_res when requesting --spread-job. +- Move to python3 for everything but SLE-11-SP4 + * For SLE-11-SP4 add a workaround to handle a python3 script (python2.7 + compliant). + ------------------------------------------------------------------- Wed Feb 19 21:27:00 UTC 2020 - Egbert Eich diff --git a/slurm.spec b/slurm.spec index 257c7c3..c8d3b25 100644 --- a/slurm.spec +++ b/slurm.spec @@ -20,7 +20,7 @@ %define so_version 35 %define ver 20.02.0 %define _ver _20_02 -%define dl_ver %{ver}-0rc1 +%define dl_ver %{ver} # so-version is 0 and seems to be stable %define pmi_so 0 %define nss_so 2 @@ -64,8 +64,10 @@ ExclusiveArch: do_not_build %if 0%{?suse_version:1} && 0%{?suse_version} <= 1140 %define comp_at %defattr(-,root,root) + %undefine python_ver %else %define have_json_c 1 + %define python_ver 3 %if 0%{?sle_version} >= 150000 || 0%{?is_opensuse} %define have_apache_rpm_macros 1 %endif @@ -143,7 +145,7 @@ BuildRequires: hdf5-devel %endif BuildRequires: libbitmask-devel BuildRequires: libcpuset-devel -BuildRequires: python +BuildRequires: python%{?python_ver} %if 0%{?have_libnuma} BuildRequires: libnuma-devel %endif @@ -525,9 +527,14 @@ Contains also cray specific documentation. %patch0 -p2 %patch1 -p1 %patch2 -p1 +%if 0%{?python_ver} < 3 +# Workaround for wrongly flagged python3 to keep SLE-11-SP4 building +mkdir -p mybin; ln -s /usr/bin/python2 mybin/python3 +%endif %build %define _lto_cflags %{nil} +[ -e $(pwd)/mybin ] && PATH=$(pwd)/mybin:$PATH %configure --enable-shared \ --disable-static \ --without-rpath \ @@ -545,6 +552,7 @@ Contains also cray specific documentation. make %{?_smp_mflags} %install +[ -e $(pwd)/mybin ] && PATH=$(pwd)/mybin:$PATH %make_install make install-contrib DESTDIR=%{buildroot} PERL_MM_PARAMS="INSTALLDIRS=vendor"