View | Details | Raw Unified | Return to ticket 13624 | Differences between
and this patch

Collapse All | Expand All

(-)a/NEWS (+3 lines)
Lines 151-156 documents those changes that are of interest to users and administrators. Link Here
151
 -- Fix sattach for interactive step.
151
 -- Fix sattach for interactive step.
152
 -- Fix srun -Z when using nss_slurm.
152
 -- Fix srun -Z when using nss_slurm.
153
 -- Avoid memory leak in srun -Z.
153
 -- Avoid memory leak in srun -Z.
154
 -- slurmstepd - reduce user requested soft rlimits when they are above max
155
    hard rlimits to avoid rlimit request being completely ignored and
156
    processes using default limits.
154
157
155
* Changes in Slurm 21.08.7
158
* Changes in Slurm 21.08.7
156
==========================
159
==========================
(-)a/RELEASE_NOTES (+2 lines)
Lines 53-58 HIGHLIGHTS Link Here
53
 -- Remove connect_timeout and timeout options from JobCompParams as there's no
53
 -- Remove connect_timeout and timeout options from JobCompParams as there's no
54
    longer a connectivity check happening in the jobcomp/elasticsearch plugin
54
    longer a connectivity check happening in the jobcomp/elasticsearch plugin
55
    when setting the location off of JobCompLoc.
55
    when setting the location off of JobCompLoc.
56
 -- User requested resource limits will be automatically reduced to max
57
    possible for the job processs instead of defaulting the existing rlimits.
56
58
57
CONFIGURATION FILE CHANGES (see man appropriate man page for details)
59
CONFIGURATION FILE CHANGES (see man appropriate man page for details)
58
=====================================================================
60
=====================================================================
(-)a/src/slurmd/slurmstepd/ulimits.c (-3 / +8 lines)
Lines 261-268 _set_limit(char **env, slurm_rlimits_info_t *rli) Link Here
261
		rlim_to_string (env_value,  req, sizeof (req)) );
261
		rlim_to_string (env_value,  req, sizeof (req)) );
262
262
263
	r.rlim_cur = (rlim_t) env_value;
263
	r.rlim_cur = (rlim_t) env_value;
264
	if (r.rlim_max < r.rlim_cur)
264
	if (r.rlim_cur > r.rlim_max) {
265
		r.rlim_max = r.rlim_cur;
265
		verbose("%s: %-14s: reducing req:%s to max:%s", __func__,
266
			rlimit_name,
267
			rlim_to_string(env_value, req, sizeof(req)),
268
			rlim_to_string(r.rlim_max, max, sizeof(max)));
269
270
		r.rlim_cur = r.rlim_max;
271
	}
266
272
267
	if (setrlimit( rli->resource, &r ) < 0) {
273
	if (setrlimit( rli->resource, &r ) < 0) {
268
		/*
274
		/*
269
- 

Return to ticket 13624