coosld/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2026-02-21 10:27:46 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

blockstore: fix force behavior

Browse Source
This commit is contained in:
Steven Allen 2019-08-23 17:37:41 -07:00
parent 0c8ae4d250
commit ee98540e00
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
blocks/blockstoreutil/remove.go
View File

@ -8,7 +8,6 @@ import (
"github.com/ipfs/go-ipfs/pin"
cid "github.com/ipfs/go-cid"
ds "github.com/ipfs/go-datastore"
bs "github.com/ipfs/go-ipfs-blockstore"
)
@ -47,10 +46,20 @@ func RmBlocks(blocks bs.GCBlockstore, pins pin.Pinner, cids []cid.Cid, opts RmBl
stillOkay := FilterPinned(pins, out, cids)
for _, c := range stillOkay {
err := blocks.DeleteBlock(c)
if err != nil && opts.Force && (err == bs.ErrNotFound || err == ds.ErrNotFound) {
// ignore non-existent blocks
} else if err != nil {
// Kept for backwards compatibility. We may want to
// remove this sometime in the future.
has, err := blocks.Has(c)
if err != nil {
out <- &RemovedBlock{Hash: c.String(), Error: err.Error()}
continue
}
if !has && !opts.Force {
out <- &RemovedBlock{Hash: c.String(), Error: bs.ErrNotFound.Error()}
continue
}
err = blocks.DeleteBlock(c)
if err != nil {
out <- &RemovedBlock{Hash: c.String(), Error: err.Error()}
} else if !opts.Quiet {
out <- &RemovedBlock{Hash: c.String()}