The batcher Reset can be implicit

lfs/batcher.go

@@ -32,6 +32,11 @@ func NewBatcher(batchSize int) *Batcher {
 // Add adds an item to the batcher. Add is safe to call from multiple
 // goroutines.
 func (b *Batcher) Add(t Transferable) {
+	if atomic.CompareAndSwapUint32(&b.exited, 1, 0) {
+		b.input = make(chan Transferable, b.batchSize)
+		go b.acceptInput()
+	}
+
 	b.input <- t
 }
 
@@ -48,14 +53,6 @@ func (b *Batcher) Exit() {
 	close(b.input)
 }
 
-// Reset allows an Exit()ed batcher to be re-started.
-func (b *Batcher) Reset() {
-	if atomic.CompareAndSwapUint32(&b.exited, 1, 0) {
-		b.input = make(chan Transferable, b.batchSize)
-		go b.acceptInput()
-	}
-}
-
 // acceptInput runs in its own goroutine and accepts input from external
 // clients. It fills and dispenses batches in a sequential order: for a batch
 // size N, N items will be processed before a new batch is ready.

lfs/transfer_queue.go

@@ -89,17 +89,12 @@ func (q *TransferQueue) Wait() {
 	q.retrywait.Wait()
 	atomic.StoreUint32(&q.retrying, 1)
 
-	if len(q.retries) > 0 {
+	if len(q.retries) > 0 && q.batcher != nil {
 		tracerx.Printf("tq: retrying %d failed transfers", len(q.retries))
-		if q.batcher != nil {
-			q.batcher.Reset()
-		}
 		for _, t := range q.retries {
 			q.Add(t)
 		}
-		if q.batcher != nil {
-			q.batcher.Exit()
-		}
+		q.batcher.Exit()
 		q.wait.Wait()
 	}