[ARVADOS] updated: 2.1.0-1521-gb7b0aeebe

[Git user]

Summary of changes:
 lib/lsf/dispatch_test.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

  discards  0122c35ac23b13bd43e9d0c480c38545eb140fdd (commit)
       via  b7b0aeebe1dc768f79229b3854be2a5fa3f39eaa (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (0122c35ac23b13bd43e9d0c480c38545eb140fdd)
            \
             N -- N -- N (b7b0aeebe1dc768f79229b3854be2a5fa3f39eaa)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

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 b7b0aeebe1dc768f79229b3854be2a5fa3f39eaa
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),
 	}
 }
 
diff --git a/lib/lsf/dispatch_test.go b/lib/lsf/dispatch_test.go
index 44a1a3d8c..5934c3ce6 100644
--- a/lib/lsf/dispatch_test.go
+++ b/lib/lsf/dispatch_test.go
@@ -83,7 +83,7 @@ func (stub lsfstub) stubCommand(s *suite, c *check.C) func(prog string, args ...
 					"-J", arvadostest.LockedContainerUUID,
 					"-n", "4",
 					"-D", "11701MB",
-					"-R", "rusage[mem=11701MB:tmp=0MB] span[hosts=1]"})
+					"-R", "rusage[mem=11701MB/host:tmp=0MB] span[hosts=1]"})
 				mtx.Lock()
 				fakejobq[nextjobid] = args[1]
 				nextjobid++
@@ -93,7 +93,7 @@ func (stub lsfstub) stubCommand(s *suite, c *check.C) func(prog string, args ...
 					"-J", arvadostest.QueuedContainerUUID,
 					"-n", "4",
 					"-D", "11701MB",
-					"-R", "rusage[mem=11701MB:tmp=45777MB] span[hosts=1]"})
+					"-R", "rusage[mem=11701MB/host:tmp=45777MB] span[hosts=1]"})
 				mtx.Lock()
 				fakejobq[nextjobid] = args[1]
 				nextjobid++

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


hooks/post-receive
--