projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '18874-merge-wb2'
[arvados.git]
/
lib
/
dispatchcloud
/
worker
/
worker.go
diff --git
a/lib/dispatchcloud/worker/worker.go
b/lib/dispatchcloud/worker/worker.go
index 0b406ce61de61f248b76bfa30c5ad449b8383374..10a28157e43ee0e496fd82b8705542a58aa0c8ca 100644
(file)
--- a/
lib/dispatchcloud/worker/worker.go
+++ b/
lib/dispatchcloud/worker/worker.go
@@
-555,9
+555,11
@@
func (wkr *worker) shutdownIfBroken(dur time.Duration) bool {
// Never shut down.
return false
}
// Never shut down.
return false
}
-
label, threshold :=
"", wkr.wp.timeoutProbe
+
prologue, epilogue, threshold := "",
"", wkr.wp.timeoutProbe
if wkr.state == StateUnknown || wkr.state == StateBooting {
if wkr.state == StateUnknown || wkr.state == StateBooting {
- label, threshold = "new ", wkr.wp.timeoutBooting
+ prologue = "new "
+ epilogue = " -- `arvados-server cloudtest` might help troubleshoot, see https://doc.arvados.org/main/admin/cloudtest.html"
+ threshold = wkr.wp.timeoutBooting
}
if dur < threshold {
return false
}
if dur < threshold {
return false
@@
-566,7
+568,7
@@
func (wkr *worker) shutdownIfBroken(dur time.Duration) bool {
"Duration": dur,
"Since": wkr.probed,
"State": wkr.state,
"Duration": dur,
"Since": wkr.probed,
"State": wkr.state,
- }).Warnf("%sinstance unresponsive, shutting down
", label
)
+ }).Warnf("%sinstance unresponsive, shutting down
%s", prologue, epilogue
)
wkr.shutdown()
return true
}
wkr.shutdown()
return true
}