Merge pull request #6444 from dirkmc/fix/pin-rm-add-lock

Fix: ensure pin rm takes a lock
ipfs · Jun 12, 2019 · 3cc3538 · 3cc3538
2 parents ffb8bf4 + 4ead108
commit 3cc3538
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/core/coreapi/pin.go b/core/coreapi/pin.go
@@ -67,6 +67,10 @@ func (api *PinAPI) Rm(ctx context.Context, p path.Path, opts ...caopts.PinRmOpti
 		return err
 	}
 
+	// Note: after unpin the pin sets are flushed to the blockstore, so we need
+	// to take a lock to prevent a concurrent garbage collection
+	defer api.blockstore.PinLock().Unlock()
+
 	if err = api.pinning.Unpin(ctx, rp.Cid(), settings.Recursive); err != nil {
 		return err
 	}