Merge branch 'slurm-23.02'

NEWS

@@ -76,6 +76,8 @@ documents those changes that are of interest to users and administrators.
  -- slurmctld - add an assert to check for magic number presence before deleting
     a partition record and clear the magic afterwards to better diagnose
     potential memory problems.
+ -- Clean up OCI containers task directories correctly.
+ -- slurm.spec - add "--with jwt" option.
 
 * Changes in Slurm 23.02.0
 ==========================

slurm.spec

@@ -36,6 +36,7 @@ Source:		%{slurm_source_dir}.tar.bz2
 # --with ucx		%_with_ucx path		require ucx support
 # --with pmix		%_with_pmix path	require pmix support
 # --with nvml		%_with_nvml path	require nvml support
+# --with jwt		%_with_jwt 1		require jwt support
 #
 
 #  Options that are off by default (enable with --with <opt>)
@@ -56,6 +57,7 @@ Source:		%{slurm_source_dir}.tar.bz2
 %bcond_with numa
 %bcond_with pmix
 %bcond_with nvml
+%bcond_with jwt
 
 # Use debug by default on all systems
 %bcond_without debug
@@ -149,6 +151,11 @@ BuildRequires: ucx-devel
 %global ucx_version %(rpm -q ucx-devel --qf "%{RPMTAG_VERSION}")
 %endif
 
+%if %{with jwt}
+BuildRequires: libjwt-devel >= 1.10.0
+Requires: libjwt >= 1.10.0
+%endif
+
 #  Allow override of sysconfdir via _slurm_sysconfdir.
 #  Note 'global' instead of 'define' needed here to work around apparent
 #   bug in rpm macro scoping (or something...)
@@ -355,6 +362,7 @@ notifies slurm about failed nodes.
 	%{!?_with_slurmrestd:--disable-slurmrestd} \
 	%{?_without_x11:--disable-x11} \
 	%{?_with_ucx} \
+	%{?_with_jwt} \
 	%{?_with_nvml} \
 	%{?_with_cflags}
 

src/slurmd/slurmstepd/container.c

@@ -1134,7 +1134,7 @@ extern void cleanup_container(stepd_step_rec_t *step)
 			char *jconfig = NULL;
 
 			path = _generate_spooldir(step, step->task[i]);
-			xstrfmtcat(jconfig, "%s/config.json", c->spool_dir);
+			xstrfmtcat(jconfig, "%s/config.json", path);
 
 			if ((unlink(jconfig) < 0) && (errno != ENOENT))
 				error("unlink(%s): %m", jconfig);