From 7f4334c75844d3df6433246256cd53aa507fd823 Mon Sep 17 00:00:00 2001 From: risk danger olson Date: Tue, 24 Jan 2017 14:12:07 -0700 Subject: [PATCH] tq: pause before making batch request --- tq/transfer_queue.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tq/transfer_queue.go b/tq/transfer_queue.go index 7f59b89c..cc996097 100644 --- a/tq/transfer_queue.go +++ b/tq/transfer_queue.go @@ -105,7 +105,6 @@ type TransferQueue struct { errorc chan error // Channel for processing errors watchers []chan string trMutex *sync.Mutex - startProgress sync.Once collectorWait sync.WaitGroup errorwait sync.WaitGroup // wait is used to keep track of pending transfers. It is incremented @@ -283,6 +282,7 @@ func (q *TransferQueue) enqueueAndCollectRetriesFor(batch batch) (batch, error) next := q.makeBatch() tracerx.Printf("tq: sending batch of size %d", len(batch)) + q.meter.Pause() bRes, err := Batch(q.manifest, q.direction, q.remote, batch.ToTransfers()) if err != nil { // If there was an error making the batch API call, mark all of @@ -307,7 +307,7 @@ func (q *TransferQueue) enqueueAndCollectRetriesFor(batch batch) (batch, error) } q.useAdapter(bRes.TransferAdapterName) - q.startProgress.Do(q.meter.Start) + q.meter.Start() toTransfer := make([]*Transfer, 0, len(bRes.Objects))