[ARVADOS] created: 2.1.0-1521-g0122c35ac

[Git user]

        at  0122c35ac23b13bd43e9d0c480c38545eb140fdd (commit)


commit 0122c35ac23b13bd43e9d0c480c38545eb140fdd
Author: Ward Vandewege <ward at curii.com>
Date:   Fri Oct 22 14:16:06 2021 -0400

    18290: add /host to the memory field in rusage so the site-configurable
           ReservationUsage value doesn't change how the memory requirement
           is interpreted.
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/lib/lsf/dispatch.go b/lib/lsf/dispatch.go
index d3ba605ab..482ec8d22 100644
--- a/lib/lsf/dispatch.go
+++ b/lib/lsf/dispatch.go
@@ -290,7 +290,7 @@ func (disp *dispatcher) bsubConstraintArgs(container arvados.Container) []string
 	return []string{
 		"-n", fmt.Sprintf("%d", vcpus),
 		"-D", fmt.Sprintf("%dMB", mem), // ulimit -d (note this doesn't limit the total container memory usage)
-		"-R", fmt.Sprintf("rusage[mem=%dMB:tmp=%dMB] span[hosts=1]", mem, tmp),
+		"-R", fmt.Sprintf("rusage[mem=%dMB/host:tmp=%dMB] span[hosts=1]", mem, tmp),
 	}
 }
 

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


hooks/post-receive
--