14360: Add explicit Start method to dispatcher.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>

diff --git a/lib/dispatchcloud/cmd.go b/lib/dispatchcloud/cmd.go
index a5a11d2fa33d378521d75c139672282f7bc128b3..92948fb300e703971e59957b4f6f98db176a42ef 100644 (file)
--- a/lib/dispatchcloud/cmd.go
+++ b/lib/dispatchcloud/cmd.go
@@ -13,5 +13,7 @@ import (
 var Command cmd.Handler = service.Command(arvados.ServiceNameDispatchCloud, newHandler)
 
 func newHandler(cluster *arvados.Cluster, _ *arvados.NodeProfile) service.Handler {
-       return &dispatcher{Cluster: cluster}
+       d := &dispatcher{Cluster: cluster}
+       go d.Start()
+       return d
 }

diff --git a/lib/dispatchcloud/dispatcher.go b/lib/dispatchcloud/dispatcher.go
index e422b3963d1d66bcc523271fde25aba3d5a0137f..707c31f249e50ae176708499cefff6013d6b7aa1 100644 (file)
--- a/lib/dispatchcloud/dispatcher.go
+++ b/lib/dispatchcloud/dispatcher.go
@@ -58,22 +58,28 @@ type dispatcher struct {
        stop      chan struct{}
 }
 
+// Start starts the dispatcher. Start can be called multiple times
+// with no ill effect.
+func (disp *dispatcher) Start() {
+       disp.setupOnce.Do(disp.setup)
+}
+
 // ServeHTTP implements service.Handler.
 func (disp *dispatcher) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-       disp.setupOnce.Do(disp.setup)
+       disp.Start()
        disp.httpHandler.ServeHTTP(w, r)
 }
 
 // CheckHealth implements service.Handler.
 func (disp *dispatcher) CheckHealth() error {
-       disp.setupOnce.Do(disp.setup)
+       disp.Start()
        return nil
 }
 
 // Stop dispatching containers and release resources. Typically used
 // in tests.
 func (disp *dispatcher) Close() {
-       disp.setupOnce.Do(disp.setup)
+       disp.Start()
        select {
        case disp.stop <- struct{}{}:
        default: