X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/bef56b9a22efac9ce73006623080e84a0b57f243..443a0b96316ed46600dc5035193adae6ac4d1f74:/sdk/go/dispatch/dispatch.go

diff --git a/sdk/go/dispatch/dispatch.go b/sdk/go/dispatch/dispatch.go
index c3d6030999..fdb52e510b 100644
--- a/sdk/go/dispatch/dispatch.go
+++ b/sdk/go/dispatch/dispatch.go
@@ -9,12 +9,12 @@ package dispatch
 import (
 	"context"
 	"fmt"
-	"log"
 	"sync"
 	"time"
 
 	"git.curoverse.com/arvados.git/sdk/go/arvados"
 	"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
+	"github.com/sirupsen/logrus"
 )
 
 const (
@@ -25,10 +25,21 @@ const (
 	Cancelled = arvados.ContainerStateCancelled
 )
 
+type Logger interface {
+	Printf(string, ...interface{})
+	Warnf(string, ...interface{})
+	Debugf(string, ...interface{})
+}
+
 // Dispatcher struct
 type Dispatcher struct {
 	Arv *arvadosclient.ArvadosClient
 
+	Logger Logger
+
+	// Batch size for container queries
+	BatchSize int64
+
 	// Queue polling frequency
 	PollPeriod time.Duration
 
@@ -62,6 +73,10 @@ type DispatchFunc func(*Dispatcher, arvados.Container, <-chan arvados.Container)
 // dispatcher's token. When a new one appears, Run calls RunContainer
 // in a new goroutine.
 func (d *Dispatcher) Run(ctx context.Context) error {
+	if d.Logger == nil {
+		d.Logger = logrus.StandardLogger()
+	}
+
 	err := d.Arv.Call("GET", "api_client_authorizations", "", "current", nil, &d.auth)
 	if err != nil {
 		return fmt.Errorf("error getting my token UUID: %v", err)
@@ -72,6 +87,10 @@ func (d *Dispatcher) Run(ctx context.Context) error {
 	poll := time.NewTicker(d.PollPeriod)
 	defer poll.Stop()
 
+	if d.BatchSize == 0 {
+		d.BatchSize = 100
+	}
+
 	for {
 		select {
 		case <-poll.C:
@@ -135,7 +154,7 @@ func (d *Dispatcher) Run(ctx context.Context) error {
 		// Containers that I know about that didn't show up in any
 		// query should be let go.
 		for uuid, tracker := range todo {
-			log.Printf("Container %q not returned by any query, stopping tracking.", uuid)
+			d.Logger.Printf("Container %q not returned by any query, stopping tracking.", uuid)
 			tracker.close()
 		}
 
@@ -145,7 +164,10 @@ func (d *Dispatcher) Run(ctx context.Context) error {
 // Start a runner in a new goroutine, and send the initial container
 // record to its updates channel.
 func (d *Dispatcher) start(c arvados.Container) *runTracker {
-	tracker := &runTracker{updates: make(chan arvados.Container, 1)}
+	tracker := &runTracker{
+		updates: make(chan arvados.Container, 1),
+		logger:  d.Logger,
+	}
 	tracker.updates <- c
 	go func() {
 		d.RunContainer(d, c, tracker.updates)
@@ -159,21 +181,41 @@ func (d *Dispatcher) start(c arvados.Container) *runTracker {
 }
 
 func (d *Dispatcher) checkForUpdates(filters [][]interface{}, todo map[string]*runTracker) bool {
+	var countList arvados.ContainerList
 	params := arvadosclient.Dict{
 		"filters": filters,
+		"count":   "exact",
+		"limit":   0,
+		"order":   []string{"priority desc"}}
+	err := d.Arv.List("containers", params, &countList)
+	if err != nil {
+		d.Logger.Warnf("error getting count of containers: %q", err)
+		return false
+	}
+	itemsAvailable := countList.ItemsAvailable
+	params = arvadosclient.Dict{
+		"filters": filters,
+		"count":   "none",
+		"limit":   d.BatchSize,
 		"order":   []string{"priority desc"}}
 	offset := 0
 	for {
 		params["offset"] = offset
+
+		// This list variable must be a new one declared
+		// inside the loop: otherwise, items in the API
+		// response would get deep-merged into the items
+		// loaded in previous iterations.
 		var list arvados.ContainerList
+
 		err := d.Arv.List("containers", params, &list)
 		if err != nil {
-			log.Printf("Error getting list of containers: %q", err)
+			d.Logger.Warnf("error getting list of containers: %q", err)
 			return false
 		}
 		d.checkListForUpdates(list.Items, todo)
 		offset += len(list.Items)
-		if len(list.Items) == 0 || list.ItemsAvailable <= offset {
+		if len(list.Items) == 0 || itemsAvailable <= offset {
 			return true
 		}
 	}
@@ -191,7 +233,7 @@ func (d *Dispatcher) checkListForUpdates(containers []arvados.Container, todo ma
 		delete(todo, c.UUID)
 
 		if c.LockedByUUID != "" && c.LockedByUUID != d.auth.UUID {
-			log.Printf("debug: ignoring %s locked by %s", c.UUID, c.LockedByUUID)
+			d.Logger.Debugf("ignoring %s locked by %s", c.UUID, c.LockedByUUID)
 		} else if alreadyTracking {
 			switch c.State {
 			case Queued:
@@ -209,7 +251,7 @@ func (d *Dispatcher) checkListForUpdates(containers []arvados.Container, todo ma
 				}
 				err := d.lock(c.UUID)
 				if err != nil {
-					log.Printf("debug: error locking container %s: %s", c.UUID, err)
+					d.Logger.Warnf("error locking container %s: %s", c.UUID, err)
 					break
 				}
 				c.State = Locked
@@ -233,7 +275,7 @@ func (d *Dispatcher) UpdateState(uuid string, state arvados.ContainerState) erro
 			"container": arvadosclient.Dict{"state": state},
 		}, nil)
 	if err != nil {
-		log.Printf("Error updating container %s to state %q: %s", uuid, state, err)
+		d.Logger.Warnf("error updating container %s to state %q: %s", uuid, state, err)
 	}
 	return err
 }
@@ -288,6 +330,7 @@ func (d *Dispatcher) TrackContainer(uuid string) error {
 type runTracker struct {
 	closing bool
 	updates chan arvados.Container
+	logger  Logger
 }
 
 func (tracker *runTracker) close() {
@@ -303,7 +346,7 @@ func (tracker *runTracker) update(c arvados.Container) {
 	}
 	select {
 	case <-tracker.updates:
-		log.Printf("debug: runner is handling updates slowly, discarded previous update for %s", c.UUID)
+		tracker.logger.Debugf("runner is handling updates slowly, discarded previous update for %s", c.UUID)
 	default:
 	}
 	tracker.updates <- c