From 82d4bc55ab640dd2be5398cb0e8dc590a87b5bd1 Mon Sep 17 00:00:00 2001 From: Brian Christiansen <brian@schedmd.com> Date: Wed, 11 Mar 2015 08:20:32 -0700 Subject: [PATCH] Update GrpCpuMins html documentation. --- doc/html/accounting.shtml | 3 ++- doc/html/resource_limits.shtml | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/doc/html/accounting.shtml b/doc/html/accounting.shtml index 0e3d40ca2ae..ec3131358f6 100644 --- a/doc/html/accounting.shtml +++ b/doc/html/accounting.shtml @@ -670,7 +670,8 @@ Limits</a> document.</p> 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. + association tree again. This limit only applies when using the Priority + Multifactor plugin. </li> <li><b>GrpCPURunMins=</b> Used to limit the combined total number of CPU diff --git a/doc/html/resource_limits.shtml b/doc/html/resource_limits.shtml index bb33146845c..66ff42c558b 100644 --- a/doc/html/resource_limits.shtml +++ b/doc/html/resource_limits.shtml @@ -131,7 +131,11 @@ specified then no limit will apply.</p> <li><b>GrpCPUMins=</b> A hard limit of cpu minutes to be used by 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. The 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. This limit only applies when using the Priority + Multifactor plugin. </li> <li><b>GrpCPUs=</b> The total count of cpus able to be used at any given -- GitLab