gc: pass context into CollectResult

License: MIT Signed-off-by: Kevin Atkinson <k@kevina.org>
ipfs · Feb 24, 2017 · b95e413 · b95e413
1 parent 9cfba7d
commit b95e413
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/core/commands/repo.go b/core/commands/repo.go
@@ -90,7 +90,7 @@ order to reclaim hard disk space.
 					}
 				}
 			} else {
-				lastErr = corerepo.CollectResult(gcOutChan, func(k *cid.Cid) {
+				lastErr = corerepo.CollectResult(req.Context(), gcOutChan, func(k *cid.Cid) {
 					outChan <- &GcResult{Key: k}
 				})
 			}

diff --git a/core/corerepo/gc.go b/core/corerepo/gc.go
@@ -88,16 +88,26 @@ func GarbageCollect(n *core.IpfsNode, ctx context.Context) error {
 	}
 	rmed := gc.GC(ctx, n.Blockstore, n.DAG, n.Pinning, roots)
 
-	return CollectResult(rmed, nil)
+	return CollectResult(ctx, rmed, nil)
 }
 
-func CollectResult(gcOut <-chan gc.Result, cb func(*cid.Cid)) error {
+func CollectResult(ctx context.Context, gcOut <-chan gc.Result, cb func(*cid.Cid)) error {
 	var errors []error
-	for res := range gcOut {
-		if res.Error != nil {
-			errors = append(errors, res.Error)
-		} else if res.KeyRemoved != nil && cb != nil {
-			cb(res.KeyRemoved)
+loop:
+	for {
+		select {
+		case res, ok := <-gcOut:
+			if !ok {
+				break loop
+			}
+			if res.Error != nil {
+				errors = append(errors, res.Error)
+			} else if res.KeyRemoved != nil && cb != nil {
+				cb(res.KeyRemoved)
+			}
+		case <-ctx.Done():
+			errors = append(errors, ctx.Err())
+			break loop
 		}
 	}