diff --git a/doc/man/man1/salloc.1 b/doc/man/man1/salloc.1 index 345fe67411e18aee4358c8d5313dabc532ce53b7..8265109cf70537c4da0c37e6bf52db9c904ce7b0 100644 --- a/doc/man/man1/salloc.1 +++ b/doc/man/man1/salloc.1 @@ -496,7 +496,7 @@ Specify the real memory required per node in MegaBytes. Default value is \fBDefMemPerNode\fR and the maximum value is \fBMaxMemPerNode\fR. If configured, both of parameters can be seen using the \fBscontrol show config\fR command. -This parameter would generally be used of whole nodes +This parameter would generally be used if whole nodes are allocated to jobs (\fBSelectType=select/linear\fR). Also see \fB\-\-mem\-per\-cpu\fR. \fB\-\-mem\fR and \fB\-\-mem\-per\-cpu\fR are mutually exclusive. diff --git a/doc/man/man1/sbatch.1 b/doc/man/man1/sbatch.1 index 88266b3a372a63442e8b321591aa81a48c998d22..5e0c856c18907fd9827e13e8012c66f6d33fac90 100644 --- a/doc/man/man1/sbatch.1 +++ b/doc/man/man1/sbatch.1 @@ -526,7 +526,7 @@ Specify the real memory required per node in MegaBytes. Default value is \fBDefMemPerNode\fR and the maximum value is \fBMaxMemPerNode\fR. If configured, both of parameters can be seen using the \fBscontrol show config\fR command. -This parameter would generally be used of whole nodes +This parameter would generally be used if whole nodes are allocated to jobs (\fBSelectType=select/linear\fR). Also see \fB\-\-mem\-per\-cpu\fR. \fB\-\-mem\fR and \fB\-\-mem\-per\-cpu\fR are mutually exclusive. diff --git a/doc/man/man1/srun.1 b/doc/man/man1/srun.1 index a637b6db963b23ed72801ee4d7017764b4243287..1b2e9cc64f0b4239bd0a3d3bd4cfeef55d77290e 100644 --- a/doc/man/man1/srun.1 +++ b/doc/man/man1/srun.1 @@ -542,7 +542,7 @@ Specify the real memory required per node in MegaBytes. Default value is \fBDefMemPerNode\fR and the maximum value is \fBMaxMemPerNode\fR. If configured, both of parameters can be seen using the \fBscontrol show config\fR command. -This parameter would generally be used of whole nodes +This parameter would generally be used if whole nodes are allocated to jobs (\fBSelectType=select/linear\fR). Also see \fB\-\-mem\-per\-cpu\fR. \fB\-\-mem\fR and \fB\-\-mem\-per\-cpu\fR are mutually exclusive. diff --git a/src/plugins/sched/wiki2/get_jobs.c b/src/plugins/sched/wiki2/get_jobs.c index b6974b8c9bfb466922ebf421ae6db6a892817a22..ddb4d54ef71852cab0b6c16d55f484dc0df5342d 100644 --- a/src/plugins/sched/wiki2/get_jobs.c +++ b/src/plugins/sched/wiki2/get_jobs.c @@ -236,7 +236,7 @@ static char * _dump_job(struct job_record *job_ptr, time_t update_time) { char *buf = NULL, tmp[16384]; char *gname, *quote, *uname; - uint32_t end_time, suspend_time; + uint32_t end_time, suspend_time, min_mem; int i, rej_sent = 0; if (!job_ptr) @@ -338,9 +338,13 @@ static char * _dump_job(struct job_record *job_ptr, time_t update_time) job_ptr->partition); xstrcat(buf, tmp); + min_mem = _get_job_min_mem(job_ptr); + if (min_mem & MEM_PER_CPU) { + min_mem &= ~MEM_PER_CPU; + } snprintf(tmp, sizeof(tmp), "RMEM=%u;RDISK=%u;", - _get_job_min_mem(job_ptr), + min__mem, _get_job_min_disk(job_ptr)); xstrcat(buf, tmp);