18071: Use dblock to prevent multiple dispatchers from competing.

[arvados.git] / lib / controller / trash.go

diff --git a/lib/controller/trash.go b/lib/controller/trash.go
index afdf95b782647b2f5f2b372eaaadb7a888fb1936..99e7aec0b66c4dbed9462c498ece37e38971157b 100644 (file)
--- a/lib/controller/trash.go
+++ b/lib/controller/trash.go
@@ -20,7 +20,7 @@ func (h *Handler) periodicWorker(workerName string, interval time.Duration, lock
                logger.Debugf("interval is %v, not running worker", interval)
                return
        }
-       if !locker.Lock(ctx, h.db) {
+       if !locker.Lock(ctx, h.dbConnector.GetDB) {
                // context canceled
                return
        }
@@ -47,7 +47,7 @@ func (h *Handler) trashSweepWorker() {
 
 func (h *Handler) containerLogSweepWorker() {
        h.periodicWorker("container log sweep", h.Cluster.Containers.Logging.SweepInterval.Duration(), dblock.ContainerLogSweep, func(ctx context.Context) error {
-               db, err := h.db(ctx)
+               db, err := h.dbConnector.GetDB(ctx)
                if err != nil {
                        return err
                }