[ARVADOS] updated: 1.3.0-3152-gd6598fd63
Git user
git at public.arvados.org
Tue Sep 15 14:50:29 UTC 2020
Summary of changes:
lib/config/config.default.yml | 5 ++++
lib/config/generated_config.go | 5 ++++
lib/crunchrun/background.go | 18 +++++++++++++
lib/dispatchcloud/dispatcher_test.go | 2 ++
lib/dispatchcloud/test/stub_driver.go | 50 ++++++++++++++++++++++++++---------
lib/dispatchcloud/worker/pool.go | 21 ++++++++-------
lib/dispatchcloud/worker/worker.go | 35 ++++++++++++++++++++++--
sdk/go/arvados/config.go | 1 +
8 files changed, 113 insertions(+), 24 deletions(-)
via d6598fd6339e6219a7103781433356dfde546527 (commit)
via 6e56f24fcafcefbe6209a9ef53d784aef16c9711 (commit)
via 224f4793b7c147cb3ef9a261e3a60cddb557e1f1 (commit)
from 62f82658619bd59644b4bdac6b83be8fe87aca0d (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 d6598fd6339e6219a7103781433356dfde546527
Merge: 62f826586 6e56f24fc
Author: Tom Clegg <tom at tomclegg.ca>
Date: Tue Sep 15 10:49:44 2020 -0400
Merge branch '16834-stale-run-lock'
fixes #16834
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at tomclegg.ca>
commit 6e56f24fcafcefbe6209a9ef53d784aef16c9711
Author: Tom Clegg <tom at tomclegg.ca>
Date: Tue Sep 15 10:49:13 2020 -0400
16834: Comments about parsing "crunch-run --list" output.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at tomclegg.ca>
diff --git a/lib/dispatchcloud/worker/worker.go b/lib/dispatchcloud/worker/worker.go
index f903c0a5a..517a5d193 100644
--- a/lib/dispatchcloud/worker/worker.go
+++ b/lib/dispatchcloud/worker/worker.go
@@ -386,9 +386,23 @@ func (wkr *worker) probeRunning() (running []string, reportsBroken, ok bool) {
staleRunLock := false
for _, s := range strings.Split(string(stdout), "\n") {
- if s == "broken" {
+ // Each line of the "crunch-run --list" output is one
+ // of the following:
+ //
+ // * a container UUID, indicating that processes
+ // related to that container are currently running.
+ // Optionally followed by " stale", indicating that
+ // the crunch-run process itself has exited (the
+ // remaining process is probably arv-mount).
+ //
+ // * the string "broken", indicating that the instance
+ // appears incapable of starting containers.
+ //
+ // See ListProcesses() in lib/crunchrun/background.go.
+ if s == "" {
+ // empty string following final newline
+ } else if s == "broken" {
reportsBroken = true
- } else if s == "" {
} else if toks := strings.Split(s, " "); len(toks) == 1 {
running = append(running, s)
} else if toks[1] == "stale" {
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list