[ARVADOS] updated: 1.1.3-123-g6346a7c
Git user
git at public.curoverse.com
Thu Mar 1 16:41:57 EST 2018
Summary of changes:
doc/_includes/_mount_types.liquid | 2 +-
.../install-dispatch.html.textile.liquid | 45 +++----
sdk/go/arvados/container.go | 3 +
.../crunch-dispatch-slurm/crunch-dispatch-slurm.go | 54 +++-----
.../crunch-dispatch-slurm_test.go | 34 ++---
services/crunch-dispatch-slurm/priority.go | 56 ++++++++
services/crunch-dispatch-slurm/priority_test.go | 143 +++++++++++++++++++++
services/crunch-dispatch-slurm/slurm.go | 4 +-
services/crunch-dispatch-slurm/squeue.go | 97 ++++++++++----
services/crunch-dispatch-slurm/squeue_test.go | 111 ++++++++++++++++
10 files changed, 435 insertions(+), 114 deletions(-)
create mode 100644 services/crunch-dispatch-slurm/priority.go
create mode 100644 services/crunch-dispatch-slurm/priority_test.go
create mode 100644 services/crunch-dispatch-slurm/squeue_test.go
via 6346a7c4c0cb5d7e8c5f01392b6cc64d329b68ec (commit)
via 6d27336e8bd1258952cc775ef5b5d291913a06ee (commit)
via 52e26b4e8bbbf505d6641becc435a939cee8c285 (commit)
via 6664c6b18ded2d97e53b0b0a853e2c7a1a86fe1c (commit)
via a837c67de6903827f7dfb3b19adfc82c30a87861 (commit)
via fce5b69e1504c3421705292c823084f6637d6c11 (commit)
via 498d29adee40f671fd2924c410226db7a6a0ba93 (commit)
via da17cdccd11d66a10cbc3bf7fbd8c84b49d4a67c (commit)
from f848ccbeb40ee87f7072b7399545424ecc0369e6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 6346a7c4c0cb5d7e8c5f01392b6cc64d329b68ec
Merge: f848ccb 6d27336
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date: Thu Mar 1 16:41:07 2018 -0500
Merge branch '12552-slurm-priority'
refs #12552
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>
diff --cc services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
index f770236,dab6025..23e4b3a
--- a/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
+++ b/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
@@@ -198,19 -198,8 +202,8 @@@ func (disp *Dispatcher) checkSqueueForO
}
}
- func (disp *Dispatcher) niceness(priority int) int {
- if priority > 1000 {
- priority = 1000
- }
- if priority < 0 {
- priority = 0
- }
- // Niceness range 1-10000
- return (1000 - priority) * 10
- }
-
func (disp *Dispatcher) sbatchArgs(container arvados.Container) ([]string, error) {
- mem := int64(math.Ceil(float64(container.RuntimeConstraints.RAM+container.RuntimeConstraints.KeepCacheRAM) / float64(1048576)))
+ mem := int64(math.Ceil(float64(container.RuntimeConstraints.RAM+container.RuntimeConstraints.KeepCacheRAM+disp.ReserveExtraRAM) / float64(1048576)))
var disk int64
for _, m := range container.Mounts {
commit 6d27336e8bd1258952cc775ef5b5d291913a06ee
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date: Wed Feb 28 11:27:12 2018 -0500
12552: Improve PrioritySpread docs.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>
diff --git a/doc/install/crunch2-slurm/install-dispatch.html.textile.liquid b/doc/install/crunch2-slurm/install-dispatch.html.textile.liquid
index b3b59cb..9784266 100644
--- a/doc/install/crunch2-slurm/install-dispatch.html.textile.liquid
+++ b/doc/install/crunch2-slurm/install-dispatch.html.textile.liquid
@@ -87,13 +87,20 @@ crunch-dispatch-slurm polls the API server periodically for new containers to ru
h3. PrioritySpread
-crunch-dispatch-slurm adjusts the "nice" values of its SLURM jobs to ensure containers are prioritized correctly relative to one another. If non-Arvados jobs run on your SLURM cluster, a lower @PrioritySpread@ helps Arvados containers compete with them. If you have an older SLURM system that limits nice values to 10000, a smaller @PrioritySpread@ can help avoid reaching that limit. In other cases, a larger value is beneficial because it reduces the total number of adjustments made by executing @scontrol at . The smallest usable value is @1 at . The default value of @10@ is used if this option is zero or negative. Example:
+crunch-dispatch-slurm adjusts the "nice" values of its SLURM jobs to ensure containers are prioritized correctly relative to one another. This option tunes the adjustment mechanism.
+* If non-Arvados jobs run on your SLURM cluster, and your Arvados containers are waiting too long in the SLURM queue because their "nice" values are too high for them to compete with other SLURM jobs, you should use a smaller PrioritySpread value.
+* If you have an older SLURM system that limits nice values to 10000, a smaller @PrioritySpread@ can help avoid reaching that limit.
+* In other cases, a larger value is beneficial because it reduces the total number of adjustments made by executing @scontrol at .
+
+The smallest usable value is @1 at . The default value of @10@ is used if this option is zero or negative. Example:
<notextile>
<pre><code class="userinput">PrioritySpread: <b>1000</b>
</code></pre>
</notextile>
+
+
h3. SbatchArguments
When crunch-dispatch-slurm invokes @sbatch@, you can add switches to the command by specifying @SbatchArguments at . You can use this to send the jobs to specific cluster partitions or add resource requests. Set @SbatchArguments@ to an array of strings. For example:
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list