[ARVADOS] updated: 1.1.3-91-ga4959ce

[Git user]

Summary of changes:
 services/crunch-dispatch-slurm/crunch-dispatch-slurm.go | 6 +++++-
 services/crunch-dispatch-slurm/usage.go                 | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

       via  a4959ce78b69f1f4e0e59e2458af8d11bc1d5510 (commit)
       via  8af8ef37ba4f673e47ba17899a83e2a683872b55 (commit)
      from  6a731b2dd982f3453db9f5b6fcf6350899da48a8 (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 a4959ce78b69f1f4e0e59e2458af8d11bc1d5510
Merge: 6a731b2 8af8ef3
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Fri Feb 23 13:26:59 2018 -0500

    Merge branch 'wtsi/13093-crunch-dispatch-slurm-add-mem' refs #13093
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>


commit 8af8ef37ba4f673e47ba17899a83e2a683872b55
Author: Joshua C. Randall <jcrandall at alum.mit.edu>
Date:   Thu Feb 15 18:50:19 2018 +0000

    add ReserveExtraRAM config option to crunch-dispatch-slurm
    
    Arvados-DCO-1.1-Signed-off-by: Joshua C. Randall <jcrandall at alum.mit.edu>

diff --git a/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go b/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
index 0879de2..f770236 100644
--- a/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
+++ b/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
@@ -47,6 +47,10 @@ type Dispatcher struct {
 	// Example: []string{"crunch-run", "--cgroup-parent-subsystem=memory"}
 	CrunchRunCommand []string
 
+	// Extra RAM to reserve (in Bytes) for SLURM job, in addition
+	// to the amount specified in the container's RuntimeConstraints
+	ReserveExtraRAM int64
+
 	// Minimum time between two attempts to run the same container
 	MinRetryPeriod arvados.Duration
 }
@@ -206,7 +210,7 @@ func (disp *Dispatcher) niceness(priority int) int {
 }
 
 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 {
diff --git a/services/crunch-dispatch-slurm/usage.go b/services/crunch-dispatch-slurm/usage.go
index f64c502..032d862 100644
--- a/services/crunch-dispatch-slurm/usage.go
+++ b/services/crunch-dispatch-slurm/usage.go
@@ -20,7 +20,8 @@ var exampleConfigFile = []byte(`
 	},
 	"CrunchRunCommand": ["crunch-run"],
 	"PollPeriod": "10s",
-	"SbatchArguments": ["--partition=foo", "--exclude=node13"]
+	"SbatchArguments": ["--partition=foo", "--exclude=node13"],
+	"ReserveExtraRAM": 268435456,
     }`)
 
 func usage(fs *flag.FlagSet) {

-----------------------------------------------------------------------


hooks/post-receive
--