[arvados] updated: 2.1.0-2616-g8288bba27

[git repository hosting]

Summary of changes:
 lib/dispatchcloud/worker/worker.go | 6 ++++++
 1 file changed, 6 insertions(+)

       via  8288bba27e9beff7273aeb65c5200248e52bab02 (commit)
      from  f70e763f7f989b0becfae6d8eee90e0d475e8ceb (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 8288bba27e9beff7273aeb65c5200248e52bab02
Author: Tom Clegg <tom at curii.com>
Date:   Fri Jun 24 01:33:11 2022 -0400

    Allow multiple clusters to use loopback driver on same host.
    
    If they don't ignore foreign UUIDs, they kill one another's processes
    because A's container is never in B's queue.
    
    refs #15370
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/dispatchcloud/worker/worker.go b/lib/dispatchcloud/worker/worker.go
index 1c8d62c20..b01a820cd 100644
--- a/lib/dispatchcloud/worker/worker.go
+++ b/lib/dispatchcloud/worker/worker.go
@@ -418,6 +418,12 @@ func (wkr *worker) probeRunning() (running []string, reportsBroken, ok bool) {
 			// empty string following final newline
 		} else if s == "broken" {
 			reportsBroken = true
+		} else if !strings.HasPrefix(s, wkr.wp.cluster.ClusterID) {
+			// Ignore crunch-run processes that belong to
+			// a different cluster (e.g., a single host
+			// running multiple clusters with the loopback
+			// driver)
+			continue
 		} else if toks := strings.Split(s, " "); len(toks) == 1 {
 			running = append(running, s)
 		} else if toks[1] == "stale" {

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


hooks/post-receive
--