From 0865bd99822e03d6d9bf8b0e118d9b8e2e7308b1 Mon Sep 17 00:00:00 2001 From: Philip Kovacs Date: Feb 01 2019 01:03:46 +0000 Subject: Release of 18.08.5 --- diff --git a/slurm.spec b/slurm.spec index 1d2e67f..ad9e487 100644 --- a/slurm.spec +++ b/slurm.spec @@ -11,8 +11,8 @@ %undefine _strict_symbol_defs_build Name: slurm -Version: 17.11.13 -Release: 2%{?dist} +Version: 18.08.5 +Release: 1%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD URL: https://slurm.schedmd.com/ @@ -25,6 +25,8 @@ Source5: slurm-setuser.in # Upstream bug #4449: release-style versioning of libslurmfull Patch0: slurm_libslurmfull_version.patch +# Upstream bug #6442 xhash_init signature change breaks xhash_test.c +Patch1: slurm_testsuite_xhash.patch # Build-related patches Patch10: slurm_perlapi_rpaths.patch @@ -190,6 +192,7 @@ Torque wrapper scripts used for helping migrate from Torque/PBS to Slurm. %prep %setup -q -n %{name_version} %patch0 -p1 +%patch1 -p1 %patch10 -p1 %patch11 -p1 %patch12 -p1 @@ -266,8 +269,6 @@ install -m 0644 -p etc/cgroup.conf.example \ %{buildroot}%{_sysconfdir}/%{name} install -m 0644 -p etc/cgroup.conf.example \ %{buildroot}%{_sysconfdir}/%{name}/cgroup.conf -install -m 0644 -p etc/cgroup_allowed_devices_file.conf.example \ - %{buildroot}%{_sysconfdir}/%{name} install -m 0644 -p etc/layouts.d.power.conf.example \ %{buildroot}%{_sysconfdir}/%{name}/layouts.d/power.conf.example install -m 0644 -p etc/layouts.d.power_cpufreq.conf.example \ @@ -278,7 +279,6 @@ install -m 0644 -p etc/slurm.conf %{buildroot}%{_sysconfdir}/%{name} install -m 0644 -p etc/slurm.conf.example %{buildroot}%{_sysconfdir}/%{name} install -m 0644 -p etc/slurmdbd.conf %{buildroot}%{_sysconfdir}/%{name} install -m 0644 -p etc/slurmdbd.conf.example %{buildroot}%{_sysconfdir}/%{name} -install -m 0644 -p etc/slurm.epilog.clean %{buildroot}%{_sysconfdir}/%{name} install -m 0644 -p etc/slurmctld.service %{buildroot}%{_unitdir} install -m 0644 -p etc/slurmd.service %{buildroot}%{_unitdir} install -m 0644 -p etc/slurmdbd.service %{buildroot}%{_unitdir} @@ -444,18 +444,17 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %dir %{_var}/spool/%{name} %dir %{_var}/spool/%{name}/ctld %dir %{_var}/spool/%{name}/d -%attr(0755,root,root) %{_sysconfdir}/%{name}/slurm.epilog.clean -%config(noreplace) %{_sysconfdir}/%{name}/cgroup*.conf +%config(noreplace) %{_sysconfdir}/%{name}/cgroup.conf %config(noreplace) %{_sysconfdir}/%{name}/slurm.conf %{_bindir}/{sacct,sacctmgr,salloc,sattach,sbatch,sbcast} %{_bindir}/{scancel,scontrol,sdiag,sh5util,sinfo,sprio} %{_bindir}/{squeue,sreport,srun,sshare,sstat,strigger} %{_bindir}/%{name}-setuser %{_libdir}/%{name}/accounting_storage_{filetxt,none,slurmdbd}.so -%{_libdir}/%{name}/acct_gather_energy_{ibmaem,ipmi,none,rapl}.so +%{_libdir}/%{name}/acct_gather_energy_{ibmaem,ipmi,none,rapl,xcc}.so %{_libdir}/%{name}/acct_gather_filesystem_{lustre,none}.so %{_libdir}/%{name}/acct_gather_interconnect_{none,ofed}.so -%{_libdir}/%{name}/acct_gather_profile_{hdf5,none}.so +%{_libdir}/%{name}/acct_gather_profile_{hdf5,influxdb,none}.so %{_libdir}/%{name}/auth_munge.so %{_libdir}/%{name}/burst_buffer_generic.so %{_libdir}/%{name}/checkpoint_{none,ompi}.so @@ -722,6 +721,9 @@ rm -f %{buildroot}%{perl_archlib}/perllocal.pod %systemd_postun_with_restart slurmdbd.service %changelog +* Thu Jan 31 2019 Philip Kovacs - 18.08.5-1 +- Release of 18.08.5 + * Thu Jan 31 2019 Philip Kovacs - 17.11.13-2 - Fix build issue on 32-bit architectures diff --git a/slurm_do_not_build_cray.patch b/slurm_do_not_build_cray.patch index a36517e..7ec7ecc 100644 --- a/slurm_do_not_build_cray.patch +++ b/slurm_do_not_build_cray.patch @@ -3,8 +3,8 @@ index 24ab9de7cc..087262c347 100644 --- a/contribs/Makefile.am +++ b/contribs/Makefile.am @@ -1,4 +1,4 @@ --SUBDIRS = cray lua mic openlava pam pam_slurm_adopt perlapi pmi2 seff sgather sgi sjobexit torque -+SUBDIRS = lua mic openlava pam pam_slurm_adopt perlapi pmi2 seff sgather sgi sjobexit torque +-SUBDIRS = cray lua mic openlava pam pam_slurm_adopt perlapi pmi pmi2 seff sgather sgi sjobexit torque ++SUBDIRS = lua mic openlava pam pam_slurm_adopt perlapi pmi pmi2 seff sgather sgi sjobexit torque EXTRA_DIST = \ gcp \ diff --git a/slurm_doc_fix.patch b/slurm_doc_fix.patch index 6a968b9..ad7fdcb 100644 --- a/slurm_doc_fix.patch +++ b/slurm_doc_fix.patch @@ -1,5 +1,5 @@ diff --git a/doc/man/man5/burst_buffer.conf.5 b/doc/man/man5/burst_buffer.conf.5 -index 34ee651513..01f47c1383 100644 +index 90f8e94fc7..efd76aa999 100644 --- a/doc/man/man5/burst_buffer.conf.5 +++ b/doc/man/man5/burst_buffer.conf.5 @@ -31,18 +31,18 @@ The configuration parameters available include: @@ -8,18 +8,18 @@ index 34ee651513..01f47c1383 100644 The options \fBAllowUsers\fR and \fBDenyUsers\fR can not both be specified. -By default all users are permitted to use burst buffers. +By default all users are permitted to use burst buffers. Possible future -+enhancement for generic plugin. ++future enhancement for generic plugin. --.\ Possible future enhancement for generic plugin --.\ .TP --.\ \fBAltPool\fR --.\ The AltPool value consists of a comma separated list of alternate pools of --.\ resources, each of which includes a name separated by a colon and a numeric --.\ value. --.\ The numeric value can include a suffix of "k", "m", "g", "t" and "p" which --.\ multiplies the numeric value by 1,024, 1,048,576, 1,073,741,824 etc. --.\ The numeric value is a 64-bit value. --.\ for example, "AltPool=test:20g,small:4g +-.\" Possible future enhancement for generic plugin +-.\" .TP +-.\" \fBAltPool\fR +-.\" The AltPool value consists of a comma separated list of alternate pools of +-.\" resources, each of which includes a name separated by a colon and a numeric +-.\" value. +-.\" The numeric value can include a suffix of "k", "m", "g", "t" and "p" which +-.\" multiplies the numeric value by 1,024, 1,048,576, 1,073,741,824 etc. +-.\" The numeric value is a 64-bit value. +-.\" for example, "AltPool=test:20g,small:4g +.TP +\fBAltPool\fR +The AltPool value consists of a comma separated list of alternate pools of @@ -32,40 +32,14 @@ index 34ee651513..01f47c1383 100644 .TP \fBCreateBuffer\fR -@@ -193,8 +193,8 @@ By default there is a 5 second timeout for the validation operations. +@@ -206,8 +206,8 @@ By default there is a 5 second timeout for the validation operations. AllowUsers=alan,brenda .br PrivateData=true --.\ .br --.\ Gres=nodes:10,other:20 +-.\" .br +-.\" Gres=nodes:10,other:20 +.br +Gres=nodes:10,other:20 .br # .br -diff --git a/doc/man/man5/slurm.conf.5 b/doc/man/man5/slurm.conf.5 -index 6a9c753f51..56da9b7573 100644 ---- a/doc/man/man5/slurm.conf.5 -+++ b/doc/man/man5/slurm.conf.5 -@@ -3434,7 +3434,7 @@ - \fB\-D\fR command line option) the \fBSlurmdSyslogDebug\fR configuration - parameter will be ignored. - The default value is \fBquiet\fR unless there is no configured --\fBSlurmdLogFile\fR, in which case the default value will be \fBfatal\fR so -+\fBSlurmdLogFile\fR, in which case the default value will be \fBfatal\fRso - that fatal errors are logged somewhere. - - .RS -diff --git a/doc/man/man5/slurmdbd.conf.5 b/doc/man/man5/slurmdbd.conf.5 -index d8e2ebe286..1dc4f789a7 100644 ---- a/doc/man/man5/slurmdbd.conf.5 -+++ b/doc/man/man5/slurmdbd.conf.5 -@@ -276,7 +276,7 @@ If the slurmdbd daemon is run in the foreground (started with the \fB\-D\fR - command line option) the \fBDebugLevelSyslog\fR configuration parameter - will be ignored. - The default value is \fBquiet\fR unless there is no configured --\fBSlurmdLogFile\fR, in which case the default value will be \fBfatal\bR so -+\fBSlurmdLogFile\fR, in which case the default value will be \fBfatal\bRso - that fatal errors are logged somewhere. - - .RS diff --git a/slurm_libslurmfull_version.patch b/slurm_libslurmfull_version.patch index 9f65ebf..d5362e5 100644 --- a/slurm_libslurmfull_version.patch +++ b/slurm_libslurmfull_version.patch @@ -1,27 +1,25 @@ -diff --git a/src/api/Makefile.am b/src/api/Makefile.am -index 80c5c60f12..c7334fe9f8 100644 --- a/src/api/Makefile.am +++ b/src/api/Makefile.am -@@ -61,12 +61,7 @@ libpmi_current = 0 - libpmi_age = 0 - libpmi_rev = 0 +@@ -44,12 +44,7 @@ + age = $(SLURM_API_AGE) + rev = $(SLURM_API_REVISION) --lib_LTLIBRARIES = libslurm.la libpmi.la +-lib_LTLIBRARIES = libslurm.la - -# The ABI of libslurmfull can easily change from 1 micro version to another. -# To avoid issue we will install this lib alongside the plugins to protect -# from version issues. -pkglib_LTLIBRARIES = libslurmfull.la -+lib_LTLIBRARIES = libslurm.la libpmi.la libslurmfull.la ++lib_LTLIBRARIES = libslurm.la libslurmfull.la # BUILT_SOURCES tells automake that when "make" is called, these targets - # need to be built before anything else. For instance, this takes care -@@ -156,7 +151,7 @@ libslurmfull_la_SOURCES = + # need to be built before anything else. +@@ -137,7 +132,7 @@ libslurmfull_la_LIBADD = $(convenience_libs) libslurmfull_la_LDFLAGS = \ $(LIB_LDFLAGS) \ - -avoid-version \ + -release $(SLURM_VERSION_STRING) \ $(FULL_OTHER_FLAGS) - # - # The libpmi_la_LIBADD specification below causes libpmi.la to relink + + # This was made so we could export all symbols from libcommon diff --git a/slurm_pmix_soname.patch b/slurm_pmix_soname.patch index d598016..1ab15db 100644 --- a/slurm_pmix_soname.patch +++ b/slurm_pmix_soname.patch @@ -1,8 +1,8 @@ diff --git a/src/plugins/mpi/pmix/mpi_pmix.c b/src/plugins/mpi/pmix/mpi_pmix.c -index 2d4c5d9dc9..dedb983f92 100644 +index 1a0998d213..c8241056bc 100644 --- a/src/plugins/mpi/pmix/mpi_pmix.c +++ b/src/plugins/mpi/pmix/mpi_pmix.c -@@ -79,8 +79,10 @@ const char plugin_name[] = "PMIx plugin"; +@@ -79,10 +79,13 @@ const char plugin_name[] = "PMIx plugin"; #if (HAVE_PMIX_VER == 1) const char plugin_type[] = "mpi/pmix_v1"; @@ -10,10 +10,13 @@ index 2d4c5d9dc9..dedb983f92 100644 #elif (HAVE_PMIX_VER == 2) const char plugin_type[] = "mpi/pmix_v2"; +const char libpmix_soname[] = "libpmix.so.2"; + #elif (HAVE_PMIX_VER == 3) + const char plugin_type[] = "mpi/pmix_v3"; ++const char libpmix_soname[] = "libpmix.so.3"; #endif const uint32_t plugin_version = SLURM_VERSION_NUMBER; -@@ -103,7 +105,7 @@ static void *_libpmix_open(void) +@@ -105,7 +108,7 @@ static void *_libpmix_open(void) #elif defined PMIXP_V2_LIBPATH xstrfmtcat(full_path, "%s/", PMIXP_V2_LIBPATH); #endif diff --git a/slurm_service_files.patch b/slurm_service_files.patch index 1f3087b..fc328c4 100644 --- a/slurm_service_files.patch +++ b/slurm_service_files.patch @@ -1,5 +1,5 @@ diff --git a/etc/slurmctld.service.in b/etc/slurmctld.service.in -index ebf92b0da4..d13a653339 100644 +index 6f175ad651..82a128ac0a 100644 --- a/etc/slurmctld.service.in +++ b/etc/slurmctld.service.in @@ -8,7 +8,7 @@ Type=forking @@ -8,11 +8,11 @@ index ebf92b0da4..d13a653339 100644 ExecReload=/bin/kill -HUP $MAINPID -PIDFile=/var/run/slurmctld.pid +PIDFile=/var/run/slurm/slurmctld.pid + LimitNOFILE=65536 @SYSTEMD_TASKSMAX_OPTION@ - [Install] diff --git a/etc/slurmd.service.in b/etc/slurmd.service.in -index 2e20bb33a3..263bd8aa77 100644 +index b36433dd7d..146b6574d2 100644 --- a/etc/slurmd.service.in +++ b/etc/slurmd.service.in @@ -8,7 +8,7 @@ Type=forking @@ -22,10 +22,10 @@ index 2e20bb33a3..263bd8aa77 100644 -PIDFile=/var/run/slurmd.pid +PIDFile=/var/run/slurm/slurmd.pid KillMode=process - LimitNOFILE=51200 + LimitNOFILE=131072 LimitMEMLOCK=infinity diff --git a/etc/slurmdbd.service.in b/etc/slurmdbd.service.in -index 5f8f73c7f1..a0aede6feb 100644 +index c80feb9d7c..97a95c0e57 100644 --- a/etc/slurmdbd.service.in +++ b/etc/slurmdbd.service.in @@ -8,7 +8,7 @@ Type=forking @@ -34,6 +34,6 @@ index 5f8f73c7f1..a0aede6feb 100644 ExecReload=/bin/kill -HUP $MAINPID -PIDFile=/var/run/slurmdbd.pid +PIDFile=/var/run/slurm/slurmdbd.pid + LimitNOFILE=65536 @SYSTEMD_TASKSMAX_OPTION@ - [Install] diff --git a/slurm_testsuite_xhash.patch b/slurm_testsuite_xhash.patch new file mode 100644 index 0000000..e236e88 --- /dev/null +++ b/slurm_testsuite_xhash.patch @@ -0,0 +1,45 @@ +diff --git a/testsuite/slurm_unit/common/xhash-test.c b/testsuite/slurm_unit/common/xhash-test.c +index 54164ae6e6..46616aef2b 100644 +--- a/testsuite/slurm_unit/common/xhash-test.c ++++ b/testsuite/slurm_unit/common/xhash-test.c +@@ -68,7 +68,7 @@ uint32_t g_hashableslen = sizeof(g_hashables)/sizeof(g_hashables[0]); + static void setup(void) + { + int i; +- g_ht = xhash_init(hashable_identify, NULL, NULL, 0); ++ g_ht = xhash_init(hashable_identify, NULL); + if (!g_ht) return; /* fatal error, will be detected by test cases */ + for (i = 0; i < g_hashableslen; ++i) { + g_hashables[i].id[0] = 0; +@@ -95,11 +95,11 @@ START_TEST(test_init_free) + mark_point(); + + /* invalid case */ +- ht = xhash_init(NULL, NULL, NULL, 0); ++ ht = xhash_init(NULL, NULL); + fail_unless(ht == NULL, "allocated table without identifying function"); + + /* alloc and free */ +- ht = xhash_init(hashable_identify, NULL, NULL, 0); ++ ht = xhash_init(hashable_identify, NULL); + fail_unless(ht != NULL, "hash table was not allocated"); + xhash_free(ht); + } +@@ -111,7 +111,7 @@ START_TEST(test_add) + hashable_t a[4] = {{"0", 0}, {"1", 1}, {"2", 2}, {"3", 3}}; + int i, len = sizeof(a)/sizeof(a[0]); + char buffer[255]; +- ht = xhash_init(hashable_identify, NULL, NULL, 0); ++ ht = xhash_init(hashable_identify, NULL); + fail_unless(xhash_add(NULL, a) == NULL, "invalid cases not null"); + fail_unless(xhash_add(ht, NULL) == NULL, "invalid cases not null"); + fail_unless(xhash_add(ht, a) != NULL, "xhash_add failed"); +@@ -207,7 +207,7 @@ START_TEST(test_count) + hashable_t a[4] = {{"0", 0}, {"1", 1}, {"2", 2}, {"3", 3}}; + fail_unless(xhash_count(ht) == g_hashableslen, + "invalid count (fixture table)"); +- ht = xhash_init(hashable_identify, NULL, NULL, 0); ++ ht = xhash_init(hashable_identify, NULL); + xhash_add(ht, a); + xhash_add(ht, a+1); + xhash_add(ht, a+2); diff --git a/sources b/sources index a3f68f2..d11fa8b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (slurm-17.11.13-2.tar.bz2) = d419984bfa1bf1be20d3439672eaf868e3e0c45549b8d696bb6f588a57e1bc1e765dbca8a9a62c54bf27c3dfbbd0f165f573459a22ef87d976bc511c22fde639 +SHA512 (slurm-18.08.5-2.tar.bz2) = ee1991983c608208cee28a99900cfe3af48ea13568859f3355973b2cace0738dc8878fa562e20c495f52a3a5caefab552f4368465b6878f24478e15e1ffe0ca1