[ARVADOS] created: 2.1.0-115-g1a4bc60b7

[Git user]

        at  1a4bc60b700ef0e1b17aaa621d63515b2e285bf7 (commit)


commit 1a4bc60b700ef0e1b17aaa621d63515b2e285bf7
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..3c19dbaf1 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, arvados.Cluster.ClusterID) {
 			continue
 		}
 		err := disp.TrackContainer(uuid)

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


hooks/post-receive
--