[ARVADOS] updated: 2.1.0-115-ga555df85f

Git user git at public.arvados.org
Thu Nov 19 21:46:06 UTC 2020

Summary of changes:
 services/crunch-dispatch-slurm/crunch-dispatch-slurm.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

  discards  1a4bc60b700ef0e1b17aaa621d63515b2e285bf7 (commit)
       via  a555df85fe5647cfd83ee3f8d1b254f97fb77a18 (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 (1a4bc60b700ef0e1b17aaa621d63515b2e285bf7)
             N -- N -- N (a555df85fe5647cfd83ee3f8d1b254f97fb77a18)

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 a555df85fe5647cfd83ee3f8d1b254f97fb77a18
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Thu Nov 19 15:36:29 2020 -0500

    17015: Ensure that containers belong to this cluster
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go b/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
index 4115482d8..a5899ce8a 100644
--- a/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
+++ b/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
@@ -202,7 +202,7 @@ var containerUuidPattern = regexp.MustCompile(`^[a-z0-9]{5}-dz642-[a-z0-9]{15}$`
 // Cancelled or Complete. See https://dev.arvados.org/issues/10979
 func (disp *Dispatcher) checkSqueueForOrphans() {
 	for _, uuid := range disp.sqCheck.All() {
-		if !containerUuidPattern.MatchString(uuid) {
+		if !containerUuidPattern.MatchString(uuid) || !strings.HasPrefix(uuid, disp.cluster.ClusterID) {
 		err := disp.TrackContainer(uuid)



More information about the arvados-commits mailing list