diff --git a/doc/html/qos.shtml b/doc/html/qos.shtml index 55c1780a71e05edece54df3f21b8a3e409b13449..618a730068bf7ee6db6bf35cd21a7c8b1a416613 100644 --- a/doc/html/qos.shtml +++ b/doc/html/qos.shtml @@ -96,8 +96,11 @@ characteristics. Valid options are: <ul> <li><b>DenyOnLimit</b> If set, jobs using this QOS will be rejected at -submission time if they do not conform to the QOS 'Max' limits. By default -jobs that go over these limits will pend until they conform. +submission time if they do not conform to the QOS 'Max' limits. Group +limits will also be treated like 'Max' limits as well and will be +denied if they go over. By default jobs that go over these limits +will pend until they conform. This currently only applies to QOS and +Association limits. <li><b>EnforceUsageThreshold</b> If set, and the QOS also has a UsageThreshold, any jobs submitted with this QOS that fall below the UsageThreshold diff --git a/doc/html/resource_limits.shtml b/doc/html/resource_limits.shtml index 41f6ba59621e56d6572fc4fe4fef59eff5fc22c4..d59401556c7e112084d22cbc9431c036ba8b1835 100644 --- a/doc/html/resource_limits.shtml +++ b/doc/html/resource_limits.shtml @@ -126,6 +126,11 @@ policy option is not specified the default will be: the option for the cluster/account pair, and if both are not specified then the option for the cluster, and if that also is not specified then no limit will apply.</p> +<p><b>NOTE:</b> Unless noted, if a job request breaches a given limit +the job will pend unless the job's QOS has the DenyOnLimit +flag set, which will cause the job to be denied at submission. When +Grp limits are considerd with respects to this flag the Grp limit +is treated as a Max limit.</p> <ul> <li><b>GrpTRESMins=</b> The total number of TRES minutes that can @@ -176,15 +181,11 @@ specified then no limit will apply.</p> </li> <li><b>MaxTRESPerJob=</b> The maximum size in TRES any given job can - have from the association/QOS. If this limit is reached the job will - be denied at submission if the QOS running the job has the - DenyOnLimit flag set, otherwise the job will pend. + have from the association/QOS. </li> <li><b>MaxTRESPerNode=</b> The maximum size in TRES each node in a job - allocation can use. If this limit is reached the job will - be denied at submission if the QOS running the job has the - DenyOnLimit flag set, otherwise the job will pend. + allocation can use. </li> <li><b>MaxJobs=</b> The total number of jobs able to run at any given @@ -205,7 +206,7 @@ specified then no limit will apply.</p> </li> <!-- For future use -<li><b>MaxTRESMinsPerJob=</b> A limit of TRES minutes to be used by jobs +<li><b>MaxTRESRunMinsPerJob=</b> A limit of TRES minutes to be used by jobs running from the given association/QOS. If this limit is reached the job will be killed will be allowed to run. </li> @@ -239,15 +240,11 @@ specified then no limit will apply.</p> <ul> <li><b>MaxTRESPerUser=</b> The maximum number of limited TRES a user can - request (combo of all jobs running or pending). If this limit is breached - the job will pend unless the QOS running the job has the - DenyOnLimit flag set, which will cause the job to be denied at submission. + request (combo of all jobs running or pending). </li> <li><b>MinTRESPerJob=</b> The minimum size in TRES any given job can - have from when using the requested QOS. If this limit is breached - the job will pend unless the QOS running the job has the - DenyOnLimit flag set, which will cause the job to be denied at submission. + have from when using the requested QOS. </li> </ul> diff --git a/doc/man/man1/sacctmgr.1 b/doc/man/man1/sacctmgr.1 index 3ee4edda2b38c67f1fd636e9f9704c5f85bba898..f3d2280909b84de10f6fdc022ae6a629986a4787 100644 --- a/doc/man/man1/sacctmgr.1 +++ b/doc/man/man1/sacctmgr.1 @@ -933,9 +933,12 @@ Valid options are .RS .TP \fIDenyOnLimit\fP -If set jobs using this QOS will be rejected at -submission time if they do not conform to the QOS 'Max' or 'Group' -limits. By default jobs that go over these limits will pend until they conform. +If set, jobs using this QOS will be rejected at +submission time if they do not conform to the QOS 'Max' limits. Group +limits will also be treated like 'Max' limits as well and will be +denied if they go over. By default jobs that go over these limits +will pend until they conform. This currently only applies to QOS and +Association limits. .TP \fIEnforceUsageThreshold\fP If set, and the QOS also has a UsageThreshold,