Merge pull request #312 from libp2p/fix/dial-queue

dialQueue: start the control loop later

dial_queue.go

@@ -110,18 +110,13 @@ func newDialQueue(params *dqParams) (*dialQueue, error) {
 		dieCh:     make(chan struct{}, params.config.maxParallelism),
 	}
 
-	go dq.control()
 	return dq, nil
 }
 
 // Start initiates action on this dial queue. It should only be called once; subsequent calls are ignored.
 func (dq *dialQueue) Start() {
 	dq.startOnce.Do(func() {
-		tgt := int(dq.dqParams.config.minParallelism)
-		for i := 0; i < tgt; i++ {
-			go dq.worker()
-		}
-		dq.nWorkers = uint(tgt)
+		go dq.control()
 	})
 }
 
@@ -139,6 +134,16 @@ func (dq *dialQueue) control() {
 		waiting = nil
 	}()
 
+	// start workers
+
+	tgt := int(dq.dqParams.config.minParallelism)
+	for i := 0; i < tgt; i++ {
+		go dq.worker()
+	}
+	dq.nWorkers = uint(tgt)
+
+	// control workers
+
 	for {
 		// First process any backlog of dial jobs and waiters -- making progress is the priority.
 		// This block is copied below; couldn't find a more concise way of doing this.