projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '16636-more-metrics' into master
[arvados.git]
/
lib
/
dispatchcloud
/
dispatcher.go
diff --git
a/lib/dispatchcloud/dispatcher.go
b/lib/dispatchcloud/dispatcher.go
index 4023896f7933dbbd489387405419097dc083434e..278bcb66579b7f37c280e0c2bf5c62ca3524694d 100644
(file)
--- a/
lib/dispatchcloud/dispatcher.go
+++ b/
lib/dispatchcloud/dispatcher.go
@@
-82,6
+82,11
@@
func (disp *dispatcher) CheckHealth() error {
return disp.pool.CheckHealth()
}
return disp.pool.CheckHealth()
}
+// Done implements service.Handler.
+func (disp *dispatcher) Done() <-chan struct{} {
+ return disp.stopped
+}
+
// Stop dispatching containers and release resources. Typically used
// in tests.
func (disp *dispatcher) Close() {
// Stop dispatching containers and release resources. Typically used
// in tests.
func (disp *dispatcher) Close() {
@@
-176,7
+181,7
@@
func (disp *dispatcher) run() {
if pollInterval <= 0 {
pollInterval = defaultPollInterval
}
if pollInterval <= 0 {
pollInterval = defaultPollInterval
}
- sched := scheduler.New(disp.Context, disp.queue, disp.pool, staleLockTimeout, pollInterval)
+ sched := scheduler.New(disp.Context, disp.queue, disp.pool,
disp.Registry,
staleLockTimeout, pollInterval)
sched.Start()
defer sched.Stop()
sched.Start()
defer sched.Stop()