closes #10979

[arvados.git] / sdk / go / dispatch / dispatch.go

diff --git a/sdk/go/dispatch/dispatch.go b/sdk/go/dispatch/dispatch.go
index 5d85c1bdfd0dbb77d09d94c0695ac6c7451e3e62..94134950d2b7b5d81eb659226bf01c560e751463 100644 (file)
--- a/sdk/go/dispatch/dispatch.go
+++ b/sdk/go/dispatch/dispatch.go
@@ -21,6 +21,7 @@ const (
        Cancelled = arvados.ContainerStateCancelled
 )
 
+// Dispatcher struct
 type Dispatcher struct {
        Arv *arvadosclient.ArvadosClient
 
@@ -130,7 +131,7 @@ func (d *Dispatcher) checkForUpdates(filters [][]interface{}) {
                        log.Printf("Error getting list of containers: %q", err)
                        return
                }
-               more = list.ItemsAvailable > len(list.Items)
+               more = len(list.Items) > 0 && list.ItemsAvailable > len(list.Items)+offset
                d.checkListForUpdates(list.Items)
        }
 }
@@ -174,7 +175,7 @@ func (d *Dispatcher) checkListForUpdates(containers []arvados.Container) {
                                }
                                d.trackers[c.UUID] = d.start(c)
                        case Cancelled, Complete:
-                               tracker.close()
+                               // no-op (we already stopped monitoring)
                        }
                }
        }
@@ -202,6 +203,30 @@ func (d *Dispatcher) Unlock(uuid string) error {
        return d.Arv.Call("POST", "containers", uuid, "unlock", nil, nil)
 }
 
+// TrackContainer starts a tracker for given uuid if one is not already existing, despite its state.
+func (d *Dispatcher) TrackContainer(uuid string) {
+       d.mtx.Lock()
+       defer d.mtx.Unlock()
+
+       if d.trackers == nil {
+               d.trackers = make(map[string]*runTracker)
+       }
+
+       _, alreadyTracking := d.trackers[uuid]
+       if alreadyTracking {
+               return
+       }
+
+       var cntr arvados.Container
+       err := d.Arv.Call("GET", "containers", uuid, "", nil, &cntr)
+       if err != nil {
+               log.Printf("Error getting container %s: %s", uuid, err)
+               return
+       }
+
+       d.trackers[uuid] = d.start(c)
+}
+
 type runTracker struct {
        closing bool
        updates chan arvados.Container