Date: Sun, 12 Apr 2020 00:57:29 +0000 (UTC) From: "Jason W. Bacon" <jwb@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r531468 - in head/sysutils/slurm-wlm: . files Message-ID: <202004120057.03C0vTiw013512@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jwb Date: Sun Apr 12 00:57:29 2020 New Revision: 531468 URL: https://svnweb.freebsd.org/changeset/ports/531468 Log: sysutils/slurm-wlm: Upgrade to 20.02.1 Numerous bug fixes and enhancements Reported by: portscout Added: head/sysutils/slurm-wlm/files/patch-src_plugins_cli__filter_user__defaults_cli__filter__user__defaults.c (contents, props changed) head/sysutils/slurm-wlm/files/patch-src_plugins_mpi_cray__shasta_mpi__cray__shasta.c (contents, props changed) head/sysutils/slurm-wlm/files/patch-src_plugins_proctrack_pgid_proctrack__pgid.c (contents, props changed) head/sysutils/slurm-wlm/files/patch-src_slurmctld_prep__slurmctld.c (contents, props changed) Deleted: head/sysutils/slurm-wlm/files/patch-src_common_read__config.h head/sysutils/slurm-wlm/files/patch-src_srun_libsrun_srun__job.c Modified: head/sysutils/slurm-wlm/Makefile head/sysutils/slurm-wlm/distinfo head/sysutils/slurm-wlm/files/patch-etc_slurm.conf.example head/sysutils/slurm-wlm/pkg-plist Modified: head/sysutils/slurm-wlm/Makefile ============================================================================== --- head/sysutils/slurm-wlm/Makefile Sun Apr 12 00:45:35 2020 (r531467) +++ head/sysutils/slurm-wlm/Makefile Sun Apr 12 00:57:29 2020 (r531468) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= slurm -DISTVERSION= 19.05.5 -PORTREVISION= 2 +DISTVERSION= 20.02.1 CATEGORIES= sysutils python MASTER_SITES= https://download.schedmd.com/slurm/ PKGNAMESUFFIX= -wlm @@ -83,7 +82,7 @@ CONFIGURE_ARGS= --without-ofed DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}-${DISTVERSION} CFLAGS+= -I${WRKSRC}/slurm -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -lsysinfo -lkvm +LDFLAGS+= -L${LOCALBASE}/lib -lsysinfo -lprocstat # Hack around nonfunctional --disable-gtktest flag pre-configure-GUI-off: Modified: head/sysutils/slurm-wlm/distinfo ============================================================================== --- head/sysutils/slurm-wlm/distinfo Sun Apr 12 00:45:35 2020 (r531467) +++ head/sysutils/slurm-wlm/distinfo Sun Apr 12 00:57:29 2020 (r531468) @@ -1,3 +1,3 @@ -TIMESTAMP = 1579355818 -SHA256 (slurm-19.05.5.tar.bz2) = 715be211b7bef80d06df0011ec91c51ab740031bd9ff722a5e60c595feaad282 -SIZE (slurm-19.05.5.tar.bz2) = 6232295 +TIMESTAMP = 1585834999 +SHA256 (slurm-20.02.1.tar.bz2) = 7ee9813c6168292404785621d6a1c3c19d1b98c32d7dc750c408728061b011a5 +SIZE (slurm-20.02.1.tar.bz2) = 6302755 Modified: head/sysutils/slurm-wlm/files/patch-etc_slurm.conf.example ============================================================================== --- head/sysutils/slurm-wlm/files/patch-etc_slurm.conf.example Sun Apr 12 00:45:35 2020 (r531467) +++ head/sysutils/slurm-wlm/files/patch-etc_slurm.conf.example Sun Apr 12 00:57:29 2020 (r531468) @@ -1,4 +1,4 @@ ---- etc/slurm.conf.example.orig 2020-01-18 17:40:31 UTC +--- etc/slurm.conf.example.orig 2020-03-26 21:44:05 UTC +++ etc/slurm.conf.example @@ -8,8 +8,8 @@ # @@ -11,14 +11,8 @@ #ControlAddr= #BackupController= #BackupAddr= -@@ -21,20 +21,20 @@ SlurmdPort=6818 - AuthType=auth/munge - #JobCredentialPrivateKey= - #JobCredentialPublicCertificate= --StateSaveLocation=/var/spool/slurm/ctld --SlurmdSpoolDir=/var/spool/slurm/d -+StateSaveLocation=/var/run/slurm -+SlurmdSpoolDir=/var/spool/slurmd +@@ -25,8 +25,8 @@ StateSaveLocation=/var/spool/slurm/ctld + SlurmdSpoolDir=/var/spool/slurm/d SwitchType=switch/none MpiDefault=none -SlurmctldPidFile=/var/run/slurmctld.pid @@ -28,12 +22,11 @@ ProctrackType=proctrack/pgid #PluginDir= #FirstJobId= - ReturnToService=0 +@@ -34,7 +34,7 @@ ReturnToService=0 #MaxJobCount= #PlugStackConfig= --#PropagatePrioProcess= + #PropagatePrioProcess= -#PropagateResourceLimits= -+#PropagatePrioProcess +PropagateResourceLimits=none #PropagateResourceLimitsExcept= #Prolog= @@ -49,17 +42,20 @@ #TrackWCKey=no #TreeWidth=50 #TmpFS= -@@ -57,7 +59,8 @@ KillWait=30 +@@ -57,10 +59,11 @@ KillWait=30 Waittime=0 # # SCHEDULING --SchedulerType=sched/backfill -+SchedulerType=sched/builtin -+SchedulerParameters=defer ++DefMemPerCPU=256 + SchedulerType=sched/backfill #SchedulerAuth= - #SelectType=select/linear + SelectType=select/cons_tres +-SelectTypeParameters=CR_Core ++SelectTypeParameters=CR_Core_Memory #PriorityType=priority/multifactor -@@ -71,22 +74,29 @@ SchedulerType=sched/backfill + #PriorityDecayHalfLife=14-0 + #PriorityUsageResetPeriod=14-0 +@@ -72,22 +75,58 @@ SelectTypeParameters=CR_Core # # LOGGING SlurmctldDebug=info @@ -84,7 +80,36 @@ #AccountingStorageLoc= #AccountingStoragePass= #AccountingStorageUser= ++ ++############################################################################ ++# Enable power saving if remote IPMI power-on is available on compute nodes. ++# If unavailable on some nodes, list them in SuspendExcNodes. ++# SlurmUser must be a member of operator and wheel and have a valid ++# login shell in order to execute shutdown on compute nodes. ++# If you prefer to control power manually, see the following scripts ++# from the SPCM port: # ++# auto-ipmi-remote-power ++# cluster-power-saver ++# cluster-power-waster ++# cluster-ipmi-power-on ++############################################################################ ++ ++# SuspendProgram=/usr/local/etc/spcm/slurm-node-suspend ++# SuspendTime should be >= SuspendTimeout + ResumeTimeout. ++# SuspendTime=600 ++# SuspendTimeout=60 ++# ++# ResumeProgram=/usr/local/etc/spcm/slurm-node-resume ++# ResumeTimeout=300 ++# BatchStartTimeout=300 ++# ++# Exempt compute nodes that double as file servers or don't have IPMI ++# remote power-on enabled. ++# ++# SuspendExcNodes=compute-001 ++ ++# # COMPUTE NODES -NodeName=linux[1-32] Procs=1 State=UNKNOWN -PartitionName=debug Nodes=ALL Default=YES MaxTime=INFINITE State=UP Added: head/sysutils/slurm-wlm/files/patch-src_plugins_cli__filter_user__defaults_cli__filter__user__defaults.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/slurm-wlm/files/patch-src_plugins_cli__filter_user__defaults_cli__filter__user__defaults.c Sun Apr 12 00:57:29 2020 (r531468) @@ -0,0 +1,10 @@ +--- src/plugins/cli_filter/user_defaults/cli_filter_user_defaults.c.orig 2020-04-02 16:01:45 UTC ++++ src/plugins/cli_filter/user_defaults/cli_filter_user_defaults.c +@@ -44,6 +44,7 @@ + #include <string.h> + #include <sys/types.h> + #include <unistd.h> ++#include <limits.h> + + #include "slurm/slurm_errno.h" + #include "src/common/slurm_xlator.h" Added: head/sysutils/slurm-wlm/files/patch-src_plugins_mpi_cray__shasta_mpi__cray__shasta.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/slurm-wlm/files/patch-src_plugins_mpi_cray__shasta_mpi__cray__shasta.c Sun Apr 12 00:57:29 2020 (r531468) @@ -0,0 +1,10 @@ +--- src/plugins/mpi/cray_shasta/mpi_cray_shasta.c.orig 2020-04-02 16:02:44 UTC ++++ src/plugins/mpi/cray_shasta/mpi_cray_shasta.c +@@ -39,6 +39,7 @@ + #include <sys/stat.h> + #include <sys/types.h> + #include <unistd.h> ++#include <limits.h> + + #include "slurm/slurm_errno.h" + Added: head/sysutils/slurm-wlm/files/patch-src_plugins_proctrack_pgid_proctrack__pgid.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/slurm-wlm/files/patch-src_plugins_proctrack_pgid_proctrack__pgid.c Sun Apr 12 00:57:29 2020 (r531468) @@ -0,0 +1,76 @@ +--- src/plugins/proctrack/pgid/proctrack_pgid.c.orig 2020-03-26 21:44:05 UTC ++++ src/plugins/proctrack/pgid/proctrack_pgid.c +@@ -49,6 +49,15 @@ + #include <sys/types.h> + #include <unistd.h> + ++#ifdef __FreeBSD__ ++#include <err.h> ++#include <sys/param.h> ++#include <sys/sysctl.h> ++#include <sys/user.h> ++ ++#include <libprocstat.h> /* must be last */ ++#endif ++ + #include "slurm/slurm.h" + #include "slurm/slurm_errno.h" + #include "src/common/log.h" +@@ -179,6 +188,52 @@ proctrack_p_wait(uint64_t cont_id) + return SLURM_SUCCESS; + } + ++ ++/* ++ * Get list of all PIDs belonging to process group cont_id ++ */ ++#ifdef __FreeBSD__ ++extern int proctrack_p_get_pids(uint64_t cont_id, pid_t **pids, int *npids) ++{ ++ pid_t *pid_array = NULL; ++ struct procstat *proc_info; ++ struct kinfo_proc *proc_list; ++ FILE *procstat_err; ++ unsigned int pid_count = 0; ++ ++ /* ++ * procstat_getprocs() prints an innocuous but annoying warning ++ * to stderr by default when no matching processes are found: ++ * ++ * https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=245318 ++ * ++ * Remove the redirect to /dev/null if this changes in the future. ++ */ ++ if ((procstat_err = fopen("/dev/null", "w+"))) ++ err_set_file(procstat_err); ++ proc_info = procstat_open_sysctl(); ++ proc_list = procstat_getprocs(proc_info, KERN_PROC_PGRP, cont_id, ++ (unsigned int *) &pid_count); ++ if (procstat_err) ++ fclose(procstat_err); ++ ++ if (pid_count > 0) { ++ xrecalloc(pid_array, sizeof(pid_t), pid_count); ++ // FIXME: Do we need to filter zombies like the Linux code? ++ // proc_list[c].ki_paddr->p_state == PRS_ZOMBIE ++ for (size_t c = 0; c < pid_count; ++c) ++ pid_array[c] = proc_list[c].ki_pid; ++ } ++ ++ procstat_freeprocs(proc_info, proc_list); ++ procstat_close(proc_info); ++ ++ *pids = pid_array; ++ *npids = pid_count; ++ ++ return SLURM_SUCCESS; ++} ++#else + extern int + proctrack_p_get_pids(uint64_t cont_id, pid_t **pids, int *npids) + { +@@ -241,3 +296,4 @@ fini: *pids = pid_array; + *npids = pid_count; + return rc; + } ++#endif Added: head/sysutils/slurm-wlm/files/patch-src_slurmctld_prep__slurmctld.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/slurm-wlm/files/patch-src_slurmctld_prep__slurmctld.c Sun Apr 12 00:57:29 2020 (r531468) @@ -0,0 +1,10 @@ +--- src/slurmctld/prep_slurmctld.c.orig 2020-04-02 16:23:16 UTC ++++ src/slurmctld/prep_slurmctld.c +@@ -35,6 +35,7 @@ + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + \*****************************************************************************/ + ++#include <signal.h> + #include "src/slurmctld/job_scheduler.h" + #include "src/slurmctld/locks.h" + #include "src/slurmctld/power_save.h" Modified: head/sysutils/slurm-wlm/pkg-plist ============================================================================== --- head/sysutils/slurm-wlm/pkg-plist Sun Apr 12 00:45:35 2020 (r531467) +++ head/sysutils/slurm-wlm/pkg-plist Sun Apr 12 00:57:29 2020 (r531468) @@ -9,7 +9,6 @@ bin/scontrol bin/sdiag %%HDF5%%bin/sh5util bin/sinfo -bin/smap bin/sprio bin/squeue bin/sreport @@ -27,8 +26,8 @@ include/slurm/smd_ns.h include/slurm/spank.h lib/libslurm.a lib/libslurm.so -lib/libslurm.so.34 -lib/libslurm.so.34.0.0 +lib/libslurm.so.35 +lib/libslurm.so.35.0.0 lib/slurm/accounting_storage_filetxt.a lib/slurm/accounting_storage_filetxt.so %%MYSQL%%lib/slurm/accounting_storage_mysql.a @@ -69,12 +68,14 @@ lib/slurm/burst_buffer_datawarp.a lib/slurm/burst_buffer_datawarp.so lib/slurm/burst_buffer_generic.a lib/slurm/burst_buffer_generic.so -lib/slurm/checkpoint_none.a -lib/slurm/checkpoint_none.so -lib/slurm/checkpoint_ompi.a -lib/slurm/checkpoint_ompi.so +lib/slurm/cli_filter_lua.a +lib/slurm/cli_filter_lua.so lib/slurm/cli_filter_none.a lib/slurm/cli_filter_none.so +lib/slurm/cli_filter_syslog.a +lib/slurm/cli_filter_syslog.so +lib/slurm/cli_filter_user_defaults.a +lib/slurm/cli_filter_user_defaults.so lib/slurm/core_spec_cray_aries.a lib/slurm/core_spec_cray_aries.so lib/slurm/core_spec_none.a @@ -127,6 +128,8 @@ lib/slurm/jobacct_gather_none.so %%CURL%%lib/slurm/jobcomp_elasticsearch.so lib/slurm/jobcomp_filetxt.a lib/slurm/jobcomp_filetxt.so +lib/slurm/jobcomp_lua.a +lib/slurm/jobcomp_lua.so %%MYSQL%%lib/slurm/jobcomp_mysql.a %%MYSQL%%lib/slurm/jobcomp_mysql.so lib/slurm/jobcomp_none.a @@ -151,10 +154,10 @@ lib/slurm/mcs_none.a lib/slurm/mcs_none.so lib/slurm/mcs_user.a lib/slurm/mcs_user.so +lib/slurm/mpi_cray_shasta.a +lib/slurm/mpi_cray_shasta.so lib/slurm/mpi_none.a lib/slurm/mpi_none.so -lib/slurm/mpi_openmpi.a -lib/slurm/mpi_openmpi.so lib/slurm/mpi_pmi2.a lib/slurm/mpi_pmi2.so lib/slurm/node_features_knl_cray.a @@ -171,6 +174,8 @@ lib/slurm/preempt_partition_prio.a lib/slurm/preempt_partition_prio.so lib/slurm/preempt_qos.a lib/slurm/preempt_qos.so +lib/slurm/prep_script.a +lib/slurm/prep_script.so lib/slurm/priority_basic.a lib/slurm/priority_basic.so lib/slurm/priority_multifactor.a @@ -237,7 +242,6 @@ man/man1/sdiag.1.gz %%HDF5%%man/man1/sh5util.1.gz man/man1/sinfo.1.gz man/man1/slurm.1.gz -man/man1/smap.1.gz man/man1/sprio.1.gz man/man1/squeue.1.gz man/man1/sreport.1.gz @@ -246,25 +250,13 @@ man/man1/sshare.1.gz man/man1/sstat.1.gz man/man1/strigger.1.gz %%GUI%%man/man1/sview.1.gz -man/man3/slurm_allocate_pack_job_blocking.3.gz +man/man3/slurm_allocate_het_job_blocking.3.gz man/man3/slurm_allocate_resources.3.gz man/man3/slurm_allocate_resources_blocking.3.gz man/man3/slurm_allocation_lookup.3.gz man/man3/slurm_allocation_msg_thr_create.3.gz man/man3/slurm_allocation_msg_thr_destroy.3.gz man/man3/slurm_api_version.3.gz -man/man3/slurm_checkpoint.3.gz -man/man3/slurm_checkpoint_able.3.gz -man/man3/slurm_checkpoint_complete.3.gz -man/man3/slurm_checkpoint_create.3.gz -man/man3/slurm_checkpoint_disable.3.gz -man/man3/slurm_checkpoint_enable.3.gz -man/man3/slurm_checkpoint_error.3.gz -man/man3/slurm_checkpoint_failed.3.gz -man/man3/slurm_checkpoint_restart.3.gz -man/man3/slurm_checkpoint_task_complete.3.gz -man/man3/slurm_checkpoint_tasks.3.gz -man/man3/slurm_checkpoint_vacate.3.gz man/man3/slurm_clear_trigger.3.gz man/man3/slurm_complete_job.3.gz man/man3/slurm_confirm_allocation.3.gz @@ -293,6 +285,8 @@ man/man3/slurm_get_errno.3.gz man/man3/slurm_get_job_steps.3.gz man/man3/slurm_get_rem_time.3.gz man/man3/slurm_get_triggers.3.gz +man/man3/slurm_het_job_lookup.3.gz +man/man3/slurm_het_job_will_run.3.gz man/man3/slurm_hostlist_create.3.gz man/man3/slurm_hostlist_destroy.3.gz man/man3/slurm_hostlist_shift.3.gz @@ -325,8 +319,6 @@ man/man3/slurm_load_partitions.3.gz man/man3/slurm_load_reservations.3.gz man/man3/slurm_load_slurmd_status.3.gz man/man3/slurm_notify_job.3.gz -man/man3/slurm_pack_job_lookup.3.gz -man/man3/slurm_pack_job_will_run.3.gz man/man3/slurm_perror.3.gz man/man3/slurm_pid2jobid.3.gz man/man3/slurm_ping.3.gz @@ -390,7 +382,6 @@ man/man3/slurm_update_step.3.gz man/man5/acct_gather.conf.5.gz man/man5/burst_buffer.conf.5.gz man/man5/cgroup.conf.5.gz -man/man5/cray.conf.5.gz man/man5/ext_sensors.conf.5.gz man/man5/gres.conf.5.gz man/man5/knl.conf.5.gz @@ -401,6 +392,7 @@ man/man5/topology.conf.5.gz man/man8/slurmctld.8.gz man/man8/slurmd.8.gz man/man8/slurmdbd.8.gz +man/man8/slurmrestd.8.gz man/man8/slurmstepd.8.gz man/man8/spank.8.gz sbin/slurmctld @@ -425,10 +417,10 @@ sbin/slurmstepd %%PORTDOCS%%%%DOCSDIR%%/html/burst_buffer.html %%PORTDOCS%%%%DOCSDIR%%/html/cgroup.conf.html %%PORTDOCS%%%%DOCSDIR%%/html/cgroups.html -%%PORTDOCS%%%%DOCSDIR%%/html/checkpoint_plugins.html %%PORTDOCS%%%%DOCSDIR%%/html/classic_fair_share.html %%PORTDOCS%%%%DOCSDIR%%/html/cli_filter_plugins.html %%PORTDOCS%%%%DOCSDIR%%/html/coding_style.pdf +%%PORTDOCS%%%%DOCSDIR%%/html/configless_slurm.html %%PORTDOCS%%%%DOCSDIR%%/html/configurator.easy.html %%PORTDOCS%%%%DOCSDIR%%/html/configurator.html %%PORTDOCS%%%%DOCSDIR%%/html/cons_res.html @@ -438,7 +430,6 @@ sbin/slurmstepd %%PORTDOCS%%%%DOCSDIR%%/html/core_spec.html %%PORTDOCS%%%%DOCSDIR%%/html/core_spec_plugins.html %%PORTDOCS%%%%DOCSDIR%%/html/cpu_management.html -%%PORTDOCS%%%%DOCSDIR%%/html/cray.conf.html %%PORTDOCS%%%%DOCSDIR%%/html/cray.html %%PORTDOCS%%%%DOCSDIR%%/html/cred_plugins.html %%PORTDOCS%%%%DOCSDIR%%/html/disclaimer.html @@ -477,6 +468,7 @@ sbin/slurmstepd %%PORTDOCS%%%%DOCSDIR%%/html/jobacct_gatherplugins.html %%PORTDOCS%%%%DOCSDIR%%/html/jobcompplugins.html %%PORTDOCS%%%%DOCSDIR%%/html/jquery.min.js +%%PORTDOCS%%%%DOCSDIR%%/html/jwt.html %%PORTDOCS%%%%DOCSDIR%%/html/k_function.gif %%PORTDOCS%%%%DOCSDIR%%/html/knl.conf.html %%PORTDOCS%%%%DOCSDIR%%/html/launch_plugins.html @@ -525,9 +517,9 @@ sbin/slurmstepd %%PORTDOCS%%%%DOCSDIR%%/html/reset.css %%PORTDOCS%%%%DOCSDIR%%/html/resource_binding.html %%PORTDOCS%%%%DOCSDIR%%/html/resource_limits.html +%%PORTDOCS%%%%DOCSDIR%%/html/rest.html %%PORTDOCS%%%%DOCSDIR%%/html/rosetta.html %%PORTDOCS%%%%DOCSDIR%%/html/route_plugin.html -%%PORTDOCS%%%%DOCSDIR%%/html/rpc.html %%PORTDOCS%%%%DOCSDIR%%/html/sacct.html %%PORTDOCS%%%%DOCSDIR%%/html/sacctmgr.html %%PORTDOCS%%%%DOCSDIR%%/html/salloc.html @@ -555,8 +547,8 @@ sbin/slurmstepd %%PORTDOCS%%%%DOCSDIR%%/html/slurmd.html %%PORTDOCS%%%%DOCSDIR%%/html/slurmdbd.conf.html %%PORTDOCS%%%%DOCSDIR%%/html/slurmdbd.html +%%PORTDOCS%%%%DOCSDIR%%/html/slurmrestd.html %%PORTDOCS%%%%DOCSDIR%%/html/slurmstepd.html -%%PORTDOCS%%%%DOCSDIR%%/html/smap.html %%PORTDOCS%%%%DOCSDIR%%/html/spank.html %%PORTDOCS%%%%DOCSDIR%%/html/sprio.html %%PORTDOCS%%%%DOCSDIR%%/html/squeue.html
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004120057.03C0vTiw013512>