run GC over internal blockstore as well

whyrusleeping · whyrusleeping · commit 5b0e92fef310 · 2015-08-13T09:56:14.000-07:00
License: MIT
Signed-off-by: Jeromy &lt;jeromyj@gmail.com&gt;
diff --git a/core/corerepo/gc.go b/core/corerepo/gc.go
@@ -21,11 +21,28 @@ func GarbageCollect(n *core.IpfsNode, ctx context.Context) error {
 		return err
 	}
 
+	internal, err := gc.GC(ctx, n.PrivBlocks, n.Pinning)
+	if err != nil {
+		return err
+	}
+
+	var normalDone bool
+	var internalDone bool
 	for {
 		select {
 		case _, ok := <-rmed:
 			if !ok {
-				return nil
+				if internalDone {
+					return nil
+				}
+				normalDone = true
+			}
+		case _, ok := <-internal:
+			if !ok {
+				if normalDone {
+					return nil
+				}
+				internalDone = true
 			}
 		case <-ctx.Done():
 			return ctx.Err()
@@ -40,6 +57,11 @@ func GarbageCollectAsync(n *core.IpfsNode, ctx context.Context) (<-chan *KeyRemo
 		return nil, err
 	}
 
+	internal, err := gc.GC(ctx, n.PrivBlocks, n.Pinning)
+	if err != nil {
+		return nil, err
+	}
+
 	out := make(chan *KeyRemoved)
 	go func() {
 		defer close(out)
@@ -50,6 +72,13 @@ func GarbageCollectAsync(n *core.IpfsNode, ctx context.Context) (<-chan *KeyRemo
 				return
 			}
 		}
+		for k := range internal {
+			select {
+			case out <- &KeyRemoved{k}:
+			case <-ctx.Done():
+				return
+			}
+		}
 	}()
 	return out, nil
 }
diff --git a/pin/gc/gc.go b/pin/gc/gc.go
@@ -42,7 +42,7 @@ func GC(ctx context.Context, bs bstore.GCBlockstore, pn pin.Pinner) (<-chan key.
 		return nil, err
 	}
 
-	output := make(chan key.Key)
+	output := make(chan key.Key, 16)
 	go func() {
 		defer close(output)
 		for {

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ func GC(ctx context.Context, bs bstore.GCBlockstore, pn pin.Pinner) (<-chan key.`
`42`	`42`	`return nil, err`
`43`	`43`	`}`
`44`	`44`
`45`		`- output := make(chan key.Key)`
	`45`	`+ output := make(chan key.Key, 16)`
`46`	`46`	`go func() {`
`47`	`47`	`defer close(output)`
`48`	`48`	`for {`