fix goroutine leaks in repo commands

License: MIT
Signed-off-by: Steven Allen <[email protected]>

core/commands/repo.go

@@ -85,18 +85,29 @@ order to reclaim hard disk space.
 				errs := false
 				for res := range gcOutChan {
 					if res.Error != nil {
-						outChan <- &GcResult{Error: res.Error.Error()}
+						select {
+						case outChan <- &GcResult{Error: res.Error.Error()}:
+						case <-req.Context().Done():
+							return
+						}
 						errs = true
 					} else {
-						outChan <- &GcResult{Key: res.KeyRemoved}
+						select {
+						case outChan <- &GcResult{Key: res.KeyRemoved}:
+						case <-req.Context().Done():
+							return
+						}
 					}
 				}
 				if errs {
 					res.SetError(fmt.Errorf("encountered errors during gc run"), cmdkit.ErrNormal)
 				}
 			} else {
 				err := corerepo.CollectResult(req.Context(), gcOutChan, func(k *cid.Cid) {
-					outChan <- &GcResult{Key: k}
+					select {
+					case outChan <- &GcResult{Key: k}:
+					case <-req.Context().Done():
+					}
 				})
 				if err != nil {
 					res.SetError(err, cmdkit.ErrNormal)
@@ -291,17 +302,29 @@ var repoVerifyCmd = &oldcmds.Command{
 		for k := range keys {
 			_, err := bs.Get(k)
 			if err != nil {
-				out <- &VerifyProgress{
+				select {
+				case out <- &VerifyProgress{
 					Msg: fmt.Sprintf("block %s was corrupt (%s)", k, err),
+				}:
+				case <-req.Context().Done():
+					return
 				}
 				fails++
 			}
 			i++
-			out <- &VerifyProgress{Progress: i}
+			select {
+			case out <- &VerifyProgress{Progress: i}:
+			case <-req.Context().Done():
+				return
+			}
 		}
 
 		if fails == 0 {
-			out <- &VerifyProgress{Msg: "verify complete, all blocks validated."}
+			select {
+			case out <- &VerifyProgress{Msg: "verify complete, all blocks validated."}:
+			case <-req.Context().Done():
+				return
+			}
 		} else {
 			res.SetError(fmt.Errorf("verify complete, some blocks were corrupt"), cmdkit.ErrNormal)
 		}