diff --git a/doc/html/accounting.shtml b/doc/html/accounting.shtml index cf7669ceb1653ae618729d1e1ea33d7a6419a71f..29e0e39b75a192d36a637305523925b88b3ee61e 100644 --- a/doc/html/accounting.shtml +++ b/doc/html/accounting.shtml @@ -638,17 +638,21 @@ in the <a href="resource_limits.html">Resource Limits</a> document.</p> this means that the parent association is used for fairshare. </li> -<li><b>GrpCPUMins=</b> A hard limit of cpu minutes to be used by jobs +<li><b>GrpCPUMins=</b> The total number of cpu minutes that can + possibly be used by past, present and future jobs running from this association and its children. If this limit is reached all jobs running in this group will be killed, and no new - jobs will be allowed to run. + jobs will be allowed to run. This usage is decayed (at a rate of + PriorityDecayHalfLife). It can also be reset (according to + PriorityUsageResetPeriod) in order to allow jobs to run against the + association tree again. </li> -<li><b>GrpCPURunMins=</b> Maximum number of CPU minutes all jobs - running with this association and its children can run at the same - time. This takes into consideration time limit of running jobs. If - the limit is reached no new jobs are started until other jobs finish - to allow time to free up. +<li><b>GrpCPURunMins=</b> Used to limit the combined total number of CPU + minutes used by all jobs running with this association and its + children. This takes into consideration time limit of + running jobs and consumes it, if the limit is reached no new jobs + are started until other jobs finish to allow time to free up. </li> <li><b>GrpCPUs=</b> The total count of cpus able to be used at any given diff --git a/doc/man/man1/sacctmgr.1 b/doc/man/man1/sacctmgr.1 index cfca365038deb11e4f2003c80ad6af2a5de86971..1df924a7af86b6b27850c02966b7a20a8b31d691 100644 --- a/doc/man/man1/sacctmgr.1 +++ b/doc/man/man1/sacctmgr.1 @@ -253,9 +253,8 @@ NOTE: This value is only meaningful for QOS PreemptMode=CANCEL) .TP \fIGrpCPUMins\fP=<max cpu minutes> -Maximum number of CPU minutes running jobs are able to be allocated in -aggregate for this association and all associations which are children -of this association. +The total number of cpu minutes that can possibly be used by past, +present and future jobs running from this association and its children. To clear a previously set value use the modify command with a new value of \-1. .P @@ -272,11 +271,11 @@ they are able to run inside the limit. .TP \fIGrpCPURunMins\fP=<max cpu run minutes> -Maximum number of CPU minutes all jobs -running with this association and all it's child associations can run -at the same time. This takes into consideration time limit of running -jobs. If the limit is reached no new jobs are started until other -jobs finish to allow time to free up. +Used to limit the combined total number of CPU minutes used by all +jobs running with this association and its children. This takes into +consideration time limit of running jobs and consumes it, if the limit +is reached no new jobs are started until other jobs finish to allow +time to free up. .TP \fIGrpCPUs\fP=<max cpus> @@ -570,17 +569,16 @@ parent association is used for fairshare. .TP \fIGrpCPUMins\fP -Maximum number of CPU minutes running jobs are able to be allocated in -aggregate for this association and all associations which are children -of this association. +The total number of cpu minutes that can possibly be used by past, +present and future jobs running from this association and its children. .TP \fIGrpCPURunMins\fP -Maximum number of CPU minutes all jobs -running with this association and all it's child associations can run -at the same time. This takes into consideration time limit of running -jobs. If the limit is reached no new jobs are started until other -jobs finish to allow time to free up. +Used to limit the combined total number of CPU minutes used by all +jobs running with this association and its children. This takes into +consideration time limit of running jobs and consumes it, if the limit +is reached no new jobs are started until other jobs finish to allow +time to free up. .TP \fIGrpCPUs\fP @@ -980,15 +978,15 @@ selected for preemption. .TP \fIGrpCPUMins\fP -Maximum number of CPU minutes running jobs are able to be allocated in -aggregate for this QOS. +The total number of cpu minutes that can possibly be used by past, +present and future jobs running from this QOS. .TP -\fIGrpCPURunMins\fP Maximum number of CPU minutes all jobs -running with this QOS can run at the same time. This takes into -consideration time limit of running jobs. If the limit is reached -no new jobs are started until other jobs finish to allow time to -free up. +\fIGrpCPURunMins\fP Used to limit the combined total number of CPU +minutes used by all jobs running with this QOS. This takes into +consideration time limit of running jobs and consumes it, if the limit +is reached no new jobs are started until other jobs finish to allow +time to free up. .TP \fIGrpCPUs\fP @@ -1104,8 +1102,8 @@ NOTE: This value is only meaningful for QOS PreemptMode=CANCEL. .TP \fIGrpCPUMins\fP -Maximum number of CPU minutes running jobs are able to be allocated in -aggregate for this QOS. +The total number of cpu minutes that can possibly be used by past, +present and future jobs running from this QOS. To clear a previously set value use the modify command with a new value of \-1. NOTE: This limit only applies when using the Priority Multifactor @@ -1462,18 +1460,20 @@ Anything included on this line will be the defaults for all associations on this cluster. These options are as follows... .TP \fIGrpCPUMins=\fP -Maximum number of CPU hours running jobs are able to -be allocated in aggregate for this association and all associations -which are children of this association. (NOTE: This limit is not -currently enforced in SLURM. You can still set this, but have to wait -for future versions of SLURM before it is enforced.) +The total number of cpu minutes that can possibly be used by past, +present and future jobs running from this association and its children. +.TP +\fIGrpCPURunMins=\fP +Used to limit the combined total number of CPU minutes used by all +jobs running with this association and its children. This takes into +consideration time limit of running jobs and consumes it, if the limit +is reached no new jobs are started until other jobs finish to allow +time to free up. .TP \fIGrpCPUs=\fP Maximum number of CPUs running jobs are able to be allocated in aggregate for this association and all associations which -are children of this association. (NOTE: This limit is not currently -enforced in SLURM. You can still set this, but have to wait for future -versions of SLURM before it is enforced.) +are children of this association. .TP \fIGrpJobs=\fP Maximum number of running jobs in aggregate for this @@ -1538,16 +1538,18 @@ A brief description of the account. \fIGrpCPUMins=\fP Maximum number of CPU hours running jobs are able to be allocated in aggregate for this association and all associations -which are children of this association. (NOTE: This limit is not -currently enforced in SLURM. You can still set this, but have to wait -for future versions of SLURM before it is enforced.) +which are children of this association. +\fIGrpCPURunMins=\fP +Used to limit the combined total number of CPU minutes used by all +jobs running with this association and its children. This takes into +consideration time limit of running jobs and consumes it, if the limit +is reached no new jobs are started until other jobs finish to allow +time to free up. .TP \fIGrpCPUs=\fP Maximum number of CPUs running jobs are able to be allocated in aggregate for this association and all associations which -are children of this association. (NOTE: This limit is not currently -enforced in SLURM. You can still set this, but have to wait for future -versions of SLURM before it is enforced.) +are children of this association. .TP \fIGrpJobs=\fP Maximum number of running jobs in aggregate for this