diff --git a/changelog b/changelog index b7cef84..0f02372 100644 --- a/changelog +++ b/changelog @@ -1,4 +1,8 @@ -* Tues Sep 6 2022 Philip Kovacs - 22.05.3-2 +* Sun Nov 27 2022 Philip Kovacs - 22.05.6-1 +- Update to 22.05.6 (#2131112) +- Update deprecated vars in slurm.conf (#2133159) + +* Tue Sep 6 2022 Philip Kovacs - 22.05.3-2 - Add slurm to epel9 (#2072632); update spec for epel 7/8/9 - Use %autochangelog macro; add changelog file diff --git a/slurm.conf b/slurm.conf index f575826..e344e1a 100644 --- a/slurm.conf +++ b/slurm.conf @@ -1,36 +1,30 @@ -# +# slurm.conf file generated by configurator.html. +# Put this file on all nodes of your cluster. # See the slurm.conf man page for more information. # -ControlMachine=localhost -ControlAddr=127.0.0.1 -#BackupController= -#BackupAddr= +ClusterName=cluster +SlurmctldHost=localhost +#SlurmctldHost= # -AuthType=auth/munge -#CheckpointType=checkpoint/none -CryptoType=crypto/munge #DisableRootJobs=NO #EnforcePartLimits=NO #Epilog= #EpilogSlurmctld= #FirstJobId=1 -#MaxJobId=999999 +#MaxJobId=67043328 #GresTypes= #GroupUpdateForce=0 #GroupUpdateTime=600 -#JobCheckpointDir=/var/slurm/checkpoint -#JobCredentialPrivateKey= -#JobCredentialPublicCertificate= #JobFileAppend=0 #JobRequeue=1 -#JobSubmitPlugins= +#JobSubmitPlugins=lua #KillOnBadExit=0 #LaunchType=launch/slurm #Licenses=foo*4,bar -#MailProg=/bin/true -#MaxJobCount=5000 +#MailProg=/bin/mail +#MaxJobCount=10000 #MaxStepCount=40000 -#MaxTasksPerNode=128 +#MaxTasksPerNode=512 MpiDefault=pmix #MpiParams=ports=#-# #PluginDir= @@ -45,7 +39,6 @@ ProctrackType=proctrack/cgroup #PropagateResourceLimitsExcept= #RebootProgram= ReturnToService=1 -#SallocDefaultCommand= SlurmctldPidFile=/var/run/slurm/slurmctld.pid SlurmctldPort=6817 SlurmdPidFile=/var/run/slurm/slurmd.pid @@ -59,7 +52,6 @@ StateSaveLocation=/var/spool/slurm/ctld SwitchType=switch/none #TaskEpilog= TaskPlugin=task/none -#TaskPluginParam= #TaskProlog= #TopologyPlugin=topology/tree #TmpFS=/tmp @@ -91,12 +83,10 @@ Waittime=0 # # SCHEDULING #DefMemPerCPU=0 -#FastSchedule=1 #MaxMemPerCPU=0 #SchedulerTimeSlice=30 SchedulerType=sched/backfill SelectType=select/linear -#SelectTypeParameters= # # # JOB PRIORITY @@ -117,14 +107,11 @@ SelectType=select/linear # LOGGING AND ACCOUNTING #AccountingStorageEnforce=0 #AccountingStorageHost= -#AccountingStorageLoc= #AccountingStoragePass= #AccountingStoragePort= AccountingStorageType=accounting_storage/none #AccountingStorageUser= AccountingStoreFlags=job_comment -ClusterName=cluster -#DebugFlags= #JobCompHost= #JobCompLoc= #JobCompPass= @@ -134,12 +121,13 @@ JobCompType=jobcomp/none #JobContainerType=job_container/none JobAcctGatherFrequency=30 JobAcctGatherType=jobacct_gather/none -SlurmctldDebug=3 -#SlurmctldLogFile= -SlurmdDebug=3 -#SlurmdLogFile= +SlurmctldDebug=info +SlurmctldLogFile=/var/log/slurm/slurmctld.log +SlurmdDebug=info +SlurmdLogFile=/var/log/slurm/slurmd.log #SlurmSchedLogFile= #SlurmSchedLogLevel= +#DebugFlags= # # # POWER SAVE SUPPORT FOR IDLE NODES (optional) @@ -156,4 +144,4 @@ SlurmdDebug=3 # # COMPUTE NODES NodeName=localhost CPUs=1 State=UNKNOWN -PartitionName=debug Nodes=localhost Default=YES MaxTime=INFINITE State=UP +PartitionName=debug Nodes=ALL Default=YES MaxTime=INFINITE State=UP diff --git a/slurm.spec b/slurm.spec index 7d102fa..743651d 100644 --- a/slurm.spec +++ b/slurm.spec @@ -15,8 +15,8 @@ %endif Name: slurm -Version: 22.05.3 -Release: 2%{?dist} +Version: 22.05.6 +Release: 1%{?dist} Summary: Simple Linux Utility for Resource Management License: GPLv2 and BSD URL: https://slurm.schedmd.com/ @@ -71,7 +71,11 @@ BuildRequires: libssh2-devel BuildRequires: lz4-devel BuildRequires: mariadb-devel BuildRequires: munge-devel +# numctl-devel not available in el9 for arch s390x (#2099483); +# task/affinity plugin won't be available in el9 for arch s390x +%if (0%{?epel} != 9) || ("%{_arch}" != "s390x") BuildRequires: numactl-devel +%endif BuildRequires: pam-devel BuildRequires: pmix-devel BuildRequires: rdma-core-devel @@ -95,6 +99,7 @@ BuildRequires: libyaml-devel ExcludeArch: armv7hl ExcludeArch: i686 +Requires: mailx Requires: munge Requires: pmix %if 0%{?fedora} && %{with ucx} diff --git a/sources b/sources index 9067673..38fd61a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (slurm-22.05.3.tar.bz2) = a500fb657f7d4d3d063307e176e26e537962434ff73ad8d13e16c34c70e94916fdab4e08e23d40aedec7edd86be996d2366e82fcb952c83f5498e59ca47c3f21 +SHA512 (slurm-22.05.6.tar.bz2) = d5ea2e4160f7fad746183cead52aa1bb7d9cf35f7a8e25ae6e042f9d2e1f6bbd5de0c8dcb273edd92a504fe8a5a57c15e5d50d74fd13f0d4cf065be7f2d89148