prevent wantmanager from leaking goroutines (and memory)

License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>

exchange/bitswap/wantmanager.go

@@ -137,34 +137,47 @@ func (mq *msgQueue) runQueue(ctx context.Context) {
 	for {
 		select {
 		case <-mq.work: // there is work to be done
+			mq.doWork(ctx)
+		case <-mq.done:
+			return
+		}
+	}
+}
 
-			err := mq.network.ConnectTo(ctx, mq.p)
+func (mq *msgQueue) doWork(ctx context.Context) {
+	// allow a minute for connections
+	// this includes looking them up in the dht
+	// dialing them, and handshaking
+	conctx, cancel := context.WithTimeout(ctx, time.Minute)
+	defer cancel()
+
+	err := mq.network.ConnectTo(conctx, mq.p)
 	if err != nil {
 		log.Noticef("cant connect to peer %s: %s", mq.p, err)
 		// TODO: cant connect, what now?
-				continue
+		return
 	}
 
 	// grab outgoing message
 	mq.outlk.Lock()
 	wlm := mq.out
-			if wlm == nil || wlm.Empty() {
-				mq.outlk.Unlock()
-				continue
-			}
 	mq.out = nil
 	mq.outlk.Unlock()
 
+	if wlm == nil || wlm.Empty() {
+		return
+	}
+
+	sendctx, cancel := context.WithTimeout(ctx, time.Second*30)
+	defer cancel()
+
 	// send wantlist updates
-			err = mq.network.SendMessage(ctx, mq.p, wlm)
+	err = mq.network.SendMessage(sendctx, mq.p, wlm)
 	if err != nil {
 		log.Noticef("bitswap send error: %s", err)
 		// TODO: what do we do if this fails?
-			}
-		case <-mq.done:
 		return
 	}
-	}
 }
 
 func (pm *WantManager) Connected(p peer.ID) {