diff --git a/assets/assets.go b/assets/assets.go index 56437dfa156..f3e14b8e567 100644 --- a/assets/assets.go +++ b/assets/assets.go @@ -78,9 +78,10 @@ func addAssetList(nd *core.IpfsNode, l []string) (cid.Cid, error) { } } - if err := api.Pin().Add(nd.Context(), basePath); err != nil { + if err := api.Pin().Add(nd.Context(), "assets", basePath); err != nil { return cid.Cid{}, err } return basePath.Cid(), nil + } diff --git a/core/commands/add.go b/core/commands/add.go index 0ad74ac95b1..1420f6b0b40 100644 --- a/core/commands/add.go +++ b/core/commands/add.go @@ -38,6 +38,7 @@ const ( onlyHashOptionName = "only-hash" chunkerOptionName = "chunker" pinOptionName = "pin" + pinPathOptionName = "pinpath" rawLeavesOptionName = "raw-leaves" noCopyOptionName = "nocopy" fstoreCacheOptionName = "fscache" @@ -123,6 +124,7 @@ You can now check what blocks have been created by: cmds.StringOption(chunkerOptionName, "s", "Chunking algorithm, size-[bytes] or rabin-[min]-[avg]-[max]").WithDefault("size-262144"), cmds.BoolOption(pinOptionName, "Pin this object when adding.").WithDefault(true), cmds.BoolOption(rawLeavesOptionName, "Use raw blocks for leaf nodes. (experimental)"), + cmds.StringOption(pinPathOptionName, "P", "Pin object under this path.").WithDefault("added/"), cmds.BoolOption(noCopyOptionName, "Add the file using filestore. Implies raw-leaves. (experimental)"), cmds.BoolOption(fstoreCacheOptionName, "Check the filestore for pre-existing blocks. (experimental)"), cmds.IntOption(cidVersionOptionName, "CID version. Defaults to 0 unless an option that depends on CIDv1 is passed. (experimental)"), @@ -162,6 +164,7 @@ You can now check what blocks have been created by: silent, _ := req.Options[silentOptionName].(bool) chunker, _ := req.Options[chunkerOptionName].(string) dopin, _ := req.Options[pinOptionName].(bool) + pinPath, _ := req.Options[pinPathOptionName].(string) rawblks, rbset := req.Options[rawLeavesOptionName].(bool) nocopy, _ := req.Options[noCopyOptionName].(bool) fscache, _ := req.Options[fstoreCacheOptionName].(bool) @@ -196,6 +199,7 @@ You can now check what blocks have been created by: options.Unixfs.Chunker(chunker), options.Unixfs.Pin(dopin), + options.Unixfs.PinPath(pinPath), options.Unixfs.HashOnly(hash), options.Unixfs.FsCache(fscache), options.Unixfs.Nocopy(nocopy), diff --git a/core/commands/dag/dag.go b/core/commands/dag/dag.go index 66d50feb1f5..d9157a5a375 100644 --- a/core/commands/dag/dag.go +++ b/core/commands/dag/dag.go @@ -61,7 +61,7 @@ into an object of the specified format. Options: []cmds.Option{ cmds.StringOption("format", "f", "Format that the object will be added as.").WithDefault("cbor"), cmds.StringOption("input-enc", "Format that the input object will be.").WithDefault("json"), - cmds.BoolOption("pin", "Pin this object when adding."), + cmds.StringOption("pin", "Pin this object when adding.").WithDefault(""), cmds.StringOption("hash", "Hash function to use").WithDefault(""), }, Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error { @@ -73,7 +73,7 @@ into an object of the specified format. ienc, _ := req.Options["input-enc"].(string) format, _ := req.Options["format"].(string) hash, _ := req.Options["hash"].(string) - dopin, _ := req.Options["pin"].(bool) + pinpath, _ := req.Options["pin"].(string) // mhType tells inputParser which hash should be used. MaxUint64 means 'use // default hash' (sha256 for cbor, sha1 for git..) @@ -88,9 +88,6 @@ into an object of the specified format. } var adder ipld.NodeAdder = api.Dag() - if dopin { - adder = api.Dag().Pinning() - } b := ipld.NewBatch(req.Context, adder) it := req.Files.Entries() @@ -107,10 +104,13 @@ into an object of the specified format. return fmt.Errorf("no node returned from ParseInputs") } - for _, nd := range nds { - err := b.Add(req.Context, nd) - if err != nil { - return err + if pinpath != "" { + + for _, nd := range nds { + err := api.Pin().Add(req.Context, pinpath, path.IpfsPath(nd.Cid())) + if err != nil { + return err + } } } diff --git a/core/commands/object/object.go b/core/commands/object/object.go index de454a542a4..c271aabe755 100644 --- a/core/commands/object/object.go +++ b/core/commands/object/object.go @@ -404,6 +404,7 @@ And then run: cmds.StringOption(datafieldencOptionName, "Encoding type of the data field, either \"text\" or \"base64\".").WithDefault("text"), cmds.BoolOption(pinOptionName, "Pin this object when adding."), cmds.BoolOption(quietOptionName, "q", "Write minimal output."), + cmds.StringOption("pinpath", "Pin under this path").WithDefault("added/"), }, Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error { api, err := cmdenv.GetApi(env, req) @@ -431,7 +432,12 @@ And then run: return err } - dopin, _ := req.Options[pinOptionName].(bool) + pinpath, _ := req.Options["pinpath"].(string) + if err != nil { + return err + } + + pin, _ := req.Options["pin"].(bool) if err != nil { return err } @@ -439,7 +445,8 @@ And then run: p, err := api.Object().Put(req.Context, file, options.Object.DataType(datafieldenc), options.Object.InputEnc(inputenc), - options.Object.Pin(dopin)) + options.Object.Pin(pin), + options.Object.PinPath(pinpath)) if err != nil { return err } diff --git a/core/commands/pin.go b/core/commands/pin.go index c1548904a83..46b1b7599f3 100644 --- a/core/commands/pin.go +++ b/core/commands/pin.go @@ -59,11 +59,12 @@ var addPinCmd = &cmds.Command{ }, Arguments: []cmds.Argument{ - cmds.StringArg("ipfs-path", true, true, "Path to object(s) to be pinned.").EnableStdin(), + cmds.StringArg("ipfs-path", true, true, "Path(es) to object(s) to be pinned.").EnableStdin(), }, Options: []cmds.Option{ - cmds.BoolOption(pinRecursiveOptionName, "r", "Recursively pin the object linked to by the specified object(s).").WithDefault(true), + cmds.BoolOption("direct", "d", "Pin the object directly"), cmds.BoolOption(pinProgressOptionName, "Show progress"), + cmds.StringOption("pinpath", "P", "Pin path.").WithDefault("default/"), }, Type: AddPinOutput{}, Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error { @@ -72,11 +73,11 @@ var addPinCmd = &cmds.Command{ return err } - // set recursive flag - recursive, _ := req.Options[pinRecursiveOptionName].(bool) + // set direct flag + direct, _ := req.Options["direct"].(bool) showProgress, _ := req.Options[pinProgressOptionName].(bool) - if err := req.ParseBodyArgs(); err != nil { + if err = req.ParseBodyArgs(); err != nil { return err } @@ -85,8 +86,13 @@ var addPinCmd = &cmds.Command{ return err } + pinPath, _ := req.Options["pinpath"].(string) + + toPin := req.Arguments + if !showProgress { - added, err := pinAddMany(req.Context, api, enc, req.Arguments, recursive) + added, err := pinAddMany(req.Context, api, enc, pinPath, toPin, !direct) + if err != nil { return err } @@ -104,7 +110,7 @@ var addPinCmd = &cmds.Command{ ch := make(chan pinResult, 1) go func() { - added, err := pinAddMany(ctx, api, enc, req.Arguments, recursive) + added, err := pinAddMany(ctx, api, enc, pinPath, toPin, !direct) ch <- pinResult{pins: added, err: err} }() @@ -136,9 +142,10 @@ var addPinCmd = &cmds.Command{ }, Encoders: cmds.EncoderMap{ cmds.Text: cmds.MakeTypedEncoder(func(req *cmds.Request, w io.Writer, out *AddPinOutput) error { - rec, found := req.Options["recursive"].(bool) + direct, found := req.Options["direct"].(bool) + var pintype string - if rec || !found { + if !direct || !found { pintype = "recursively" } else { pintype = "directly" @@ -180,7 +187,7 @@ var addPinCmd = &cmds.Command{ }, } -func pinAddMany(ctx context.Context, api coreiface.CoreAPI, enc cidenc.Encoder, paths []string, recursive bool) ([]string, error) { +func pinAddMany(ctx context.Context, api coreiface.CoreAPI, enc cidenc.Encoder, pinPath string, paths []string, recursive bool) ([]string, error) { added := make([]string, len(paths)) for i, b := range paths { rp, err := api.ResolvePath(ctx, path.New(b)) @@ -188,7 +195,7 @@ func pinAddMany(ctx context.Context, api coreiface.CoreAPI, enc cidenc.Encoder, return nil, err } - if err := api.Pin().Add(ctx, rp, options.Pin.Recursive(recursive)); err != nil { + if err := api.Pin().Add(ctx, pinPath, rp, options.Pin.Recursive(recursive)); err != nil { return nil, err } added[i] = enc.Encode(rp.Cid()) @@ -202,15 +209,15 @@ var rmPinCmd = &cmds.Command{ Tagline: "Remove pinned objects from local storage.", ShortDescription: ` Removes the pin from the given object allowing it to be garbage -collected if needed. (By default, recursively. Use -r=false for direct pins.) +collected if needed. By default, removes recursive pins. `, }, Arguments: []cmds.Argument{ - cmds.StringArg("ipfs-path", true, true, "Path to object(s) to be unpinned.").EnableStdin(), + cmds.StringArg("pin-path", true, true, "Pin paths").EnableStdin(), }, Options: []cmds.Option{ - cmds.BoolOption(pinRecursiveOptionName, "r", "Recursively unpin the object linked to by the specified object(s).").WithDefault(true), + cmds.BoolOption("direct", "d", "Unpins a direct pin").WithDefault(false), }, Type: PinOutput{}, Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error { @@ -220,32 +227,20 @@ collected if needed. (By default, recursively. Use -r=false for direct pins.) } // set recursive flag - recursive, _ := req.Options[pinRecursiveOptionName].(bool) + direct, _ := req.Options["direct"].(bool) + recursive := !direct if err := req.ParseBodyArgs(); err != nil { return err } - enc, err := cmdenv.GetCidEncoder(req) - if err != nil { - return err - } - - pins := make([]string, 0, len(req.Arguments)) for _, b := range req.Arguments { - rp, err := api.ResolvePath(req.Context, path.New(b)) - if err != nil { - return err - } - - id := enc.Encode(rp.Cid()) - pins = append(pins, id) - if err := api.Pin().Rm(req.Context, rp, options.Pin.RmRecursive(recursive)); err != nil { + if err := api.Pin().Rm(req.Context, b, options.Pin.RmRecursive(recursive)); err != nil { return err } } - return cmds.EmitOnce(res, &PinOutput{pins}) + return cmds.EmitOnce(res, &PinOutput{req.Arguments}) }, Encoders: cmds.EncoderMap{ cmds.Text: cmds.MakeTypedEncoder(func(req *cmds.Request, w io.Writer, out *PinOutput) error { @@ -312,6 +307,7 @@ Example: }, Options: []cmds.Option{ cmds.StringOption(pinTypeOptionName, "t", "The type of pinned keys to list. Can be \"direct\", \"indirect\", \"recursive\", or \"all\".").WithDefault("all"), + cmds.BoolOption("recursive", "r", "List all pins under given prefix"), cmds.BoolOption(pinQuietOptionName, "q", "Write just hashes of objects."), }, Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error { @@ -320,15 +316,9 @@ Example: return err } - api, err := cmdenv.GetApi(env, req) - if err != nil { - return err - } - typeStr, _ := req.Options[pinTypeOptionName].(string) - if err != nil { - return err - } + + recursive, _ := req.Options["recursive"].(bool) switch typeStr { case "all", "direct", "indirect", "recursive": @@ -337,38 +327,29 @@ Example: return err } - enc, err := cmdenv.GetCidEncoder(req) - if err != nil { - return err + prefix := "" + if len(req.Arguments) == 1 { + prefix = req.Arguments[0] } - var keys map[cid.Cid]RefKeyObject - if len(req.Arguments) > 0 { - keys, err = pinLsKeys(req.Context, req.Arguments, typeStr, n, api) - } else { - keys, err = pinLsAll(req.Context, typeStr, n) - } + keys, err := pinLsAll(req.Context, typeStr, prefix, recursive, n) + if err != nil { return err } - refKeys := make(map[string]RefKeyObject, len(keys)) - for k, v := range keys { - refKeys[enc.Encode(k)] = v - } - - return cmds.EmitOnce(res, &RefKeyList{Keys: refKeys}) + return cmds.EmitOnce(res, keys) }, Type: RefKeyList{}, Encoders: cmds.EncoderMap{ cmds.Text: cmds.MakeTypedEncoder(func(req *cmds.Request, w io.Writer, out *RefKeyList) error { quiet, _ := req.Options[pinQuietOptionName].(bool) - for k, v := range out.Keys { + for _, v := range out.Keys { if quiet { - fmt.Fprintf(w, "%s\n", k) + fmt.Fprintf(w, "%s\n", v.Object.String()) } else { - fmt.Fprintf(w, "%s %s\n", k, v.Type) + fmt.Fprintf(w, "%s %s %s\n", v.Object.String(), v.PinType, v.PinPath) } } @@ -392,42 +373,30 @@ new pin and removing the old one. }, Arguments: []cmds.Argument{ - cmds.StringArg("from-path", true, false, "Path to old object."), + cmds.StringArg("pinpath", true, false, "Pin path of the old object."), cmds.StringArg("to-path", true, false, "Path to new object to be pinned."), }, - Options: []cmds.Option{ - cmds.BoolOption(pinUnpinOptionName, "Remove the old pin.").WithDefault(true), - }, - Type: PinOutput{}, + Options: []cmds.Option{}, + Type: PinOutput{}, Run: func(req *cmds.Request, res cmds.ResponseEmitter, env cmds.Environment) error { api, err := cmdenv.GetApi(env, req) if err != nil { return err } - enc, err := cmdenv.GetCidEncoder(req) - if err != nil { - return err - } - - unpin, _ := req.Options[pinUnpinOptionName].(bool) + from := req.Arguments[0] - // Resolve the paths ahead of time so we can return the actual CIDs - from, err := api.ResolvePath(req.Context, path.New(req.Arguments[0])) - if err != nil { - return err - } to, err := api.ResolvePath(req.Context, path.New(req.Arguments[1])) if err != nil { return err } - err = api.Pin().Update(req.Context, from, to, options.Pin.Unpin(unpin)) + err = api.Pin().Update(req.Context, from, to) if err != nil { return err } - return cmds.EmitOnce(res, &PinOutput{Pins: []string{enc.Encode(from.Cid()), enc.Encode(to.Cid())}}) + return cmds.EmitOnce(res, &PinOutput{Pins: []string{from, to.String()}}) }, Encoders: cmds.EncoderMap{ cmds.Text: cmds.MakeTypedEncoder(func(req *cmds.Request, w io.Writer, out *PinOutput) error { @@ -492,80 +461,120 @@ var verifyPinCmd = &cmds.Command{ } type RefKeyObject struct { - Type string + PinType string + PinPath string + Object cid.Cid } type RefKeyList struct { - Keys map[string]RefKeyObject + Keys []RefKeyObject } -func pinLsKeys(ctx context.Context, args []string, typeStr string, n *core.IpfsNode, api coreiface.CoreAPI) (map[cid.Cid]RefKeyObject, error) { - - mode, ok := pin.StringToMode(typeStr) - if !ok { - return nil, fmt.Errorf("invalid pin mode '%s'", typeStr) - } - - keys := make(map[cid.Cid]RefKeyObject) - - for _, p := range args { - c, err := api.ResolvePath(ctx, path.New(p)) +// func pinFindCids(args []string, ctx context.Context, api string, n *core.IpfsNode) (map[string]RefKeyObject, error) { +// +// keys := make(map[cid.Cid]RefKeyObject) +// +// cids := make([]cid.Cid, 0, len(args)) +// for _, p := range args { +// c, err := api.ResolvePath(ctx, path.New(p)) +// if err != nil { +// return nil, err +// } +// +// cids = append(cids, c.Cid()) +// } +// +// pinneds, err := n.Pinning.CheckIfPinned(cids...) +// if err != nil { +// return nil, err +// } +// +// for _, p := range pinneds { +// +// if !p.Pinned() { +// return nil, fmt.Errorf("path '%s' is not pinned", p) +// } +// +// keys[p.Key.String()] = RefKeyObject{ +// PinType: p.String(), +// } +// } +// +// return keys, nil +// } + +func pinLsAll(ctx context.Context, typeStr string, prefix string, recursive bool, n *core.IpfsNode) (*RefKeyList, error) { + // TODO: replace string with type? + keys := make([]RefKeyObject, 0) + + var recursiveMap map[string]cid.Cid + var directMap map[string]cid.Cid + + if recursive { + var err error + recursiveMap, err = n.Pinning.PrefixedPins(prefix, true) if err != nil { return nil, err } - - pinType, pinned, err := n.Pinning.IsPinnedWithType(c.Cid(), mode) + directMap, err = n.Pinning.PrefixedPins(prefix, false) if err != nil { return nil, err } - - if !pinned { - return nil, fmt.Errorf("path '%s' is not pinned", p) - } - - switch pinType { - case "direct", "indirect", "recursive", "internal": - default: - pinType = "indirect through " + pinType + } else { + recursiveMap = make(map[string]cid.Cid) + c, err := n.Pinning.GetPin(prefix, true) + if err != pin.ErrNotPinned && err != nil { + return nil, err + } else if err != pin.ErrNotPinned { + recursiveMap[prefix] = *c } - keys[c.Cid()] = RefKeyObject{ - Type: pinType, + directMap = make(map[string]cid.Cid) + c, err = n.Pinning.GetPin(prefix, false) + if err != pin.ErrNotPinned && err != nil { + return nil, err + } else if err != pin.ErrNotPinned { + directMap[prefix] = *c } } - return keys, nil -} - -func pinLsAll(ctx context.Context, typeStr string, n *core.IpfsNode) (map[cid.Cid]RefKeyObject, error) { - - keys := make(map[cid.Cid]RefKeyObject) - - AddToResultKeys := func(keyList []cid.Cid, typeStr string) { - for _, c := range keyList { - keys[c] = RefKeyObject{ - Type: typeStr, - } + if typeStr == "recursive" || typeStr == "all" { + for path, c := range recursiveMap { + // TODO: review whole RefKeyObject thing + keys = append(keys, RefKeyObject{ + PinType: "recursive", + Object: c, + PinPath: path, + }) } } - if typeStr == "direct" || typeStr == "all" { - AddToResultKeys(n.Pinning.DirectKeys(), "direct") + for path, c := range directMap { + // TODO: review whole RefKeyObject thing + keys = append(keys, RefKeyObject{ + PinType: "direct", + Object: c, + PinPath: path, + }) + } } if typeStr == "indirect" || typeStr == "all" { - set := cid.NewSet() - for _, k := range n.Pinning.RecursiveKeys() { - err := dag.EnumerateChildren(ctx, dag.GetLinksWithDAG(n.DAG), k, set.Visit) + for p, c := range recursiveMap { + set := cid.NewSet() + err := dag.EnumerateChildren(ctx, dag.GetLinksWithDAG(n.DAG), c, set.Visit) if err != nil { return nil, err } + for _, k := range set.Keys() { + keys = append(keys, RefKeyObject{ + PinType: "indirect", + Object: k, + PinPath: p, + }) + } } - AddToResultKeys(set.Keys(), "indirect") - } - if typeStr == "recursive" || typeStr == "all" { - AddToResultKeys(n.Pinning.RecursiveKeys(), "recursive") } - return keys, nil + return &RefKeyList{Keys: keys}, nil } // PinVerifyRes is the result returned for each pin checked in "pin verify" @@ -593,11 +602,19 @@ type pinVerifyOpts struct { func pinVerify(ctx context.Context, n *core.IpfsNode, opts pinVerifyOpts, enc cidenc.Encoder) <-chan interface{} { visited := make(map[cid.Cid]PinStatus) - bs := n.Blocks.Blockstore() DAG := dag.NewDAGService(bserv.New(bs, offline.Exchange(bs))) getLinks := dag.GetLinksWithDAG(DAG) - recPins := n.Pinning.RecursiveKeys() + + recPins, err := n.Pinning.PinnedCids(true) + if err != nil { + status := PinStatus{Ok: false} + // TODO: do something about this error reporting + status.BadNodes = []BadNode{BadNode{Err: err.Error()}} + out := make(chan interface{}) + out <- &PinVerifyRes{"", status} + return out + } var checkPin func(root cid.Cid) PinStatus checkPin = func(root cid.Cid) PinStatus { diff --git a/core/commands/urlstore.go b/core/commands/urlstore.go index abebf76dbc8..2503b1ae817 100644 --- a/core/commands/urlstore.go +++ b/core/commands/urlstore.go @@ -40,6 +40,7 @@ settings for 'ipfs add'. Options: []cmds.Option{ cmds.BoolOption(trickleOptionName, "t", "Use trickle-dag format for dag generation."), cmds.BoolOption(pinOptionName, "Pin this object when adding.").WithDefault(true), + cmds.StringOption("pinpath", "P", "Pin object under this path.").WithDefault("added/"), }, Arguments: []cmds.Argument{ cmds.StringArg("url", true, false, "URL to add to IPFS"), @@ -71,9 +72,11 @@ settings for 'ipfs add'. useTrickledag, _ := req.Options[trickleOptionName].(bool) dopin, _ := req.Options[pinOptionName].(bool) + pinPath, _ := req.Options["pinpath"].(string) opts := []options.UnixfsAddOption{ options.Unixfs.Pin(dopin), + options.Unixfs.PinPath(pinPath), options.Unixfs.CidVersion(1), options.Unixfs.RawLeaves(true), options.Unixfs.Nocopy(true), @@ -89,7 +92,9 @@ settings for 'ipfs add'. if err != nil { return err } + size, _ := file.Size() + return cmds.EmitOnce(res, &BlockStat{ Key: enc.Encode(path.Cid()), Size: int(size), diff --git a/core/coreapi/block.go b/core/coreapi/block.go index 79b89ed02fb..7081002b094 100644 --- a/core/coreapi/block.go +++ b/core/coreapi/block.go @@ -8,7 +8,7 @@ import ( "io/ioutil" util "github.com/ipfs/go-ipfs/blocks/blockstoreutil" - pin "github.com/ipfs/go-ipfs/pin" + // pin "github.com/ipfs/go-ipfs/pin" blocks "github.com/ipfs/go-block-format" cid "github.com/ipfs/go-cid" @@ -45,17 +45,16 @@ func (api *BlockAPI) Put(ctx context.Context, src io.Reader, opts ...caopts.Bloc return nil, err } - if settings.Pin { - defer api.blockstore.PinLock().Unlock() - } - err = api.blocks.AddBlock(b) if err != nil { return nil, err } if settings.Pin { - api.pinning.PinWithMode(b.Cid(), pin.Recursive) + err = api.pinning.AddPin(settings.PinPath, b.Cid(), true) + if err != nil { + return nil, err + } } return &BlockStat{path: path.IpldPath(b.Cid()), size: len(data)}, nil diff --git a/core/coreapi/dag.go b/core/coreapi/dag.go index 9e72d067334..090b765765c 100644 --- a/core/coreapi/dag.go +++ b/core/coreapi/dag.go @@ -3,9 +3,9 @@ package coreapi import ( "context" - "github.com/ipfs/go-ipfs/pin" + // "github.com/ipfs/go-ipfs/pin" - cid "github.com/ipfs/go-cid" + // cid "github.com/ipfs/go-cid" ipld "github.com/ipfs/go-ipld-format" ) @@ -18,34 +18,28 @@ type dagAPI struct { type pinningAdder CoreAPI func (adder *pinningAdder) Add(ctx context.Context, nd ipld.Node) error { - defer adder.blockstore.PinLock().Unlock() - if err := adder.dag.Add(ctx, nd); err != nil { - return err - } - - adder.pinning.PinWithMode(nd.Cid(), pin.Recursive) - - return adder.pinning.Flush() + return adder.dag.Add(ctx, nd) } func (adder *pinningAdder) AddMany(ctx context.Context, nds []ipld.Node) error { - defer adder.blockstore.PinLock().Unlock() - - if err := adder.dag.AddMany(ctx, nds); err != nil { - return err - } - - cids := cid.NewSet() - - for _, nd := range nds { - c := nd.Cid() - if cids.Visit(c) { - adder.pinning.PinWithMode(c, pin.Recursive) - } - } - return adder.pinning.Flush() + return adder.dag.AddMany(ctx, nds) // err != nil { + // return err + // } + // + // cids := cid.NewSet() + // + // for _, nd := range nds { + // c := nd.Cid() + // if cids.Visit(c) { + // err := adder.pinning.AddPin(pinPath, c, true) + // if err != nil { + // return err + // } + // } + // } + // return nil } func (api *dagAPI) Pinning() ipld.NodeAdder { diff --git a/core/coreapi/object.go b/core/coreapi/object.go index 2c1678d9d91..f994747ac79 100644 --- a/core/coreapi/object.go +++ b/core/coreapi/object.go @@ -12,7 +12,6 @@ import ( "io/ioutil" "github.com/ipfs/go-ipfs/dagutils" - "github.com/ipfs/go-ipfs/pin" cid "github.com/ipfs/go-cid" ipld "github.com/ipfs/go-ipld-format" @@ -108,18 +107,13 @@ func (api *ObjectAPI) Put(ctx context.Context, src io.Reader, opts ...caopts.Obj return nil, err } - if options.Pin { - defer api.blockstore.PinLock().Unlock() - } - err = api.dag.Add(ctx, dagnode) if err != nil { return nil, err } if options.Pin { - api.pinning.PinWithMode(dagnode.Cid(), pin.Recursive) - err = api.pinning.Flush() + err = api.pinning.AddPin(options.PinPath, dagnode.Cid(), true) if err != nil { return nil, err } diff --git a/core/coreapi/pin.go b/core/coreapi/pin.go index bd2663f0304..4aedd5ad0e1 100644 --- a/core/coreapi/pin.go +++ b/core/coreapi/pin.go @@ -11,24 +11,26 @@ import ( coreiface "github.com/ipfs/interface-go-ipfs-core" caopts "github.com/ipfs/interface-go-ipfs-core/options" path "github.com/ipfs/interface-go-ipfs-core/path" + + "github.com/ipfs/go-ipfs/pin" ) type PinAPI CoreAPI -func (api *PinAPI) Add(ctx context.Context, p path.Path, opts ...caopts.PinAddOption) error { - dagNode, err := api.core().ResolveNode(ctx, p) +func (api *PinAPI) Add(ctx context.Context, pinpath string, p path.Path, opts ...caopts.PinAddOption) error { + settings, err := caopts.PinAddOptions(opts...) if err != nil { - return fmt.Errorf("pin: %s", err) + return nil } - settings, err := caopts.PinAddOptions(opts...) + dagNode, err := api.core().ResolveNode(ctx, p) + if err != nil { - return err + return fmt.Errorf("pin: %s", err) } - defer api.blockstore.PinLock().Unlock() + err = api.pinning.Pin(ctx, pinpath, dagNode, settings.Recursive) - err = api.pinning.Pin(ctx, dagNode, settings.Recursive) if err != nil { return fmt.Errorf("pin: %s", err) } @@ -37,72 +39,45 @@ func (api *PinAPI) Add(ctx context.Context, p path.Path, opts ...caopts.PinAddOp return err } - return api.pinning.Flush() + return nil } -func (api *PinAPI) Ls(ctx context.Context, opts ...caopts.PinLsOption) ([]coreiface.Pin, error) { +func (api *PinAPI) Ls(ctx context.Context, prefix string, opts ...caopts.PinLsOption) ([]coreiface.Pin, error) { settings, err := caopts.PinLsOptions(opts...) if err != nil { return nil, err } switch settings.Type { - case "all", "direct", "indirect", "recursive": + case "all", "direct", "recursive", "indirect": default: return nil, fmt.Errorf("invalid type '%s', must be one of {direct, indirect, recursive, all}", settings.Type) } - return api.pinLsAll(settings.Type, ctx) + return api.pinLsAll(settings.Type, prefix, ctx, settings.Recursive) } // Rm pin rm api -func (api *PinAPI) Rm(ctx context.Context, p path.Path, opts ...caopts.PinRmOption) error { - rp, err := api.core().ResolvePath(ctx, p) - if err != nil { - return err - } - +func (api *PinAPI) Rm(ctx context.Context, p string, opts ...caopts.PinRmOption) error { settings, err := caopts.PinRmOptions(opts...) if err != nil { return err } - if err = api.pinning.Unpin(ctx, rp.Cid(), settings.Recursive); err != nil { - return err - } - - return api.pinning.Flush() + return api.pinning.Unpin(p, settings.Recursive) } -func (api *PinAPI) Update(ctx context.Context, from path.Path, to path.Path, opts ...caopts.PinUpdateOption) error { - settings, err := caopts.PinUpdateOptions(opts...) - if err != nil { - return err - } - - fp, err := api.core().ResolvePath(ctx, from) - if err != nil { - return err - } - +func (api *PinAPI) Update(ctx context.Context, from string, to path.Path, opts ...caopts.PinUpdateOption) error { tp, err := api.core().ResolvePath(ctx, to) if err != nil { return err } - - defer api.blockstore.PinLock().Unlock() - - err = api.pinning.Update(ctx, fp.Cid(), tp.Cid(), settings.Unpin) - if err != nil { - return err - } - - return api.pinning.Flush() + return api.pinning.Update(ctx, from, tp.Cid()) } type pinStatus struct { - cid cid.Cid ok bool + pinPath string badNodes []coreiface.BadPinNode } @@ -116,6 +91,10 @@ func (s *pinStatus) Ok() bool { return s.ok } +func (s *pinStatus) PinPath() string { + return s.pinPath +} + func (s *pinStatus) BadNodes() []coreiface.BadPinNode { return s.badNodes } @@ -133,25 +112,30 @@ func (api *PinAPI) Verify(ctx context.Context) (<-chan coreiface.PinStatus, erro bs := api.blockstore DAG := merkledag.NewDAGService(bserv.New(bs, offline.Exchange(bs))) getLinks := merkledag.GetLinksWithDAG(DAG) - recPins := api.pinning.RecursiveKeys() + recPins, err := api.pinning.PrefixedPins("", true) + + if err != nil { + return nil, err + } - var checkPin func(root cid.Cid) *pinStatus - checkPin = func(root cid.Cid) *pinStatus { - if status, ok := visited[root]; ok { + var checkPin func(root cid.Cid, pinPath string) *pinStatus + checkPin = func(root cid.Cid, pinPath string) *pinStatus { + status, ok := visited[root] + if ok { return status } links, err := getLinks(ctx, root) if err != nil { - status := &pinStatus{ok: false, cid: root} + status := &pinStatus{ok: false, pinPath: pinPath} status.badNodes = []coreiface.BadPinNode{&badNode{path: path.IpldPath(root), err: err}} visited[root] = status return status } - status := &pinStatus{ok: true, cid: root} + status = &pinStatus{ok: true} for _, lnk := range links { - res := checkPin(lnk.Cid) + res := checkPin(lnk.Cid, pinPath) if !res.ok { status.ok = false status.badNodes = append(status.badNodes, res.badNodes...) @@ -165,8 +149,8 @@ func (api *PinAPI) Verify(ctx context.Context) (<-chan coreiface.PinStatus, erro out := make(chan coreiface.PinStatus) go func() { defer close(out) - for _, c := range recPins { - out <- checkPin(c) + for path, c := range recPins { + out <- checkPin(c, path) } }() @@ -175,9 +159,14 @@ func (api *PinAPI) Verify(ctx context.Context) (<-chan coreiface.PinStatus, erro type pinInfo struct { pinType string + pinPath string path path.Resolved } +func (p *pinInfo) PinPath() string { + return p.pinPath +} + func (p *pinInfo) Path() path.Resolved { return p.path } @@ -186,42 +175,75 @@ func (p *pinInfo) Type() string { return p.pinType } -func (api *PinAPI) pinLsAll(typeStr string, ctx context.Context) ([]coreiface.Pin, error) { +func (api *PinAPI) pinLsAll(typeStr string, prefix string, ctx context.Context, recursive bool) ([]coreiface.Pin, error) { + keys := make([]coreiface.Pin, 0) - keys := make(map[cid.Cid]*pinInfo) + var recursiveMap map[string]cid.Cid + var directMap map[string]cid.Cid - AddToResultKeys := func(keyList []cid.Cid, typeStr string) { - for _, c := range keyList { - keys[c] = &pinInfo{ - pinType: typeStr, - path: path.IpldPath(c), - } + if recursive { + var err error + recursiveMap, err = api.pinning.PrefixedPins(prefix, true) + if err != nil { + return nil, err + } + directMap, err = api.pinning.PrefixedPins(prefix, false) + if err != nil { + return nil, err + } + } else { + recursiveMap = make(map[string]cid.Cid) + c, err := api.pinning.GetPin(prefix, true) + if err != pin.ErrNotPinned && err != nil { + return nil, err + } else if err != pin.ErrNotPinned { + recursiveMap[prefix] = *c + } + directMap = make(map[string]cid.Cid) + c, err = api.pinning.GetPin(prefix, false) + if err != pin.ErrNotPinned && err != nil { + return nil, err + } else if err != pin.ErrNotPinned { + directMap[prefix] = *c } } + if typeStr == "recursive" || typeStr == "all" { + for pinPath, c := range recursiveMap { + keys = append(keys, &pinInfo{ + pinType: "recursive", + path: path.IpldPath(c), + pinPath: pinPath, + }) + } + } if typeStr == "direct" || typeStr == "all" { - AddToResultKeys(api.pinning.DirectKeys(), "direct") + for pinPath, c := range directMap { + keys = append(keys, &pinInfo{ + pinType: "direct", + path: path.IpldPath(c), + pinPath: pinPath, + }) + } } if typeStr == "indirect" || typeStr == "all" { - set := cid.NewSet() - for _, k := range api.pinning.RecursiveKeys() { - err := merkledag.EnumerateChildren(ctx, merkledag.GetLinksWithDAG(api.dag), k, set.Visit) + for pinPath, c := range recursiveMap { + set := cid.NewSet() + err := merkledag.EnumerateChildren(ctx, merkledag.GetLinksWithDAG(api.dag), c, set.Visit) if err != nil { return nil, err } + for _, k := range set.Keys() { + keys = append(keys, &pinInfo{ + pinType: "indirect", + pinPath: pinPath, + path: path.IpldPath(k), + }) + } } - AddToResultKeys(set.Keys(), "indirect") - } - if typeStr == "recursive" || typeStr == "all" { - AddToResultKeys(api.pinning.RecursiveKeys(), "recursive") } - out := make([]coreiface.Pin, 0, len(keys)) - for _, v := range keys { - out = append(out, v) - } - - return out, nil + return keys, nil } func (api *PinAPI) core() coreiface.CoreAPI { diff --git a/core/coreapi/unixfs.go b/core/coreapi/unixfs.go index 00bc26c9a1e..7ccdbc09978 100644 --- a/core/coreapi/unixfs.go +++ b/core/coreapi/unixfs.go @@ -88,6 +88,7 @@ func (api *UnixfsAPI) Add(ctx context.Context, files files.Node, opts ...options fileAdder.Progress = settings.Progress } fileAdder.Pin = settings.Pin && !settings.OnlyHash + fileAdder.PinPath = settings.PinPath fileAdder.Silent = settings.Silent fileAdder.RawLeaves = settings.RawLeaves fileAdder.NoCopy = settings.NoCopy diff --git a/core/coreunix/add.go b/core/coreunix/add.go index 1a348855b66..b37cf1cf9db 100644 --- a/core/coreunix/add.go +++ b/core/coreunix/add.go @@ -66,6 +66,7 @@ type Adder struct { Out chan<- interface{} Progress bool Pin bool + PinPath string Trickle bool RawLeaves bool Silent bool @@ -168,15 +169,14 @@ func (adder *Adder) PinRoot(root ipld.Node) error { } if adder.tempRoot.Defined() { - err := adder.pinning.Unpin(adder.ctx, adder.tempRoot, true) + err := adder.pinning.UnpinCidUnderPrefix("tmp/temproot/", adder.tempRoot, true) if err != nil { return err } adder.tempRoot = rnk } - adder.pinning.PinWithMode(rnk, pin.Recursive) - return adder.pinning.Flush() + return adder.pinning.AddPin(adder.PinPath, rnk, true) } func (adder *Adder) outputDirs(path string, fsn mfs.FSNode) error { diff --git a/core/node/core.go b/core/node/core.go index ddb42aff5c4..e0f382e9bad 100644 --- a/core/node/core.go +++ b/core/node/core.go @@ -15,7 +15,6 @@ import ( "github.com/ipfs/go-datastore" "github.com/ipfs/go-ipfs-blockstore" "github.com/ipfs/go-ipfs-exchange-interface" - "github.com/ipfs/go-ipfs-exchange-offline" "github.com/ipfs/go-ipld-format" "github.com/ipfs/go-merkledag" "github.com/ipfs/go-mfs" @@ -40,15 +39,7 @@ func BlockService(lc fx.Lifecycle, bs blockstore.Blockstore, rem exchange.Interf // Pinning creates new pinner which tells GC which blocks should be kept func Pinning(bstore blockstore.Blockstore, ds format.DAGService, repo repo.Repo) (pin.Pinner, error) { - internalDag := merkledag.NewDAGService(blockservice.New(bstore, offline.Exchange(bstore))) - pinning, err := pin.LoadPinner(repo.Datastore(), ds, internalDag) - if err != nil { - // TODO: we should move towards only running 'NewPinner' explicitly on - // node init instead of implicitly here as a result of the pinner keys - // not being found in the datastore. - // this is kinda sketchy and could cause data loss - pinning = pin.NewPinner(repo.Datastore(), ds, internalDag) - } + pinning := pin.NewPinner(ds, repo.Datastore()) return pinning, nil } diff --git a/fuse/ipns/common.go b/fuse/ipns/common.go index 182236aabf3..68dbd4d4866 100644 --- a/fuse/ipns/common.go +++ b/fuse/ipns/common.go @@ -18,16 +18,6 @@ func InitializeKeyspace(n *core.IpfsNode, key ci.PrivKey) error { emptyDir := ft.EmptyDirNode() - err := n.Pinning.Pin(ctx, emptyDir, false) - if err != nil { - return err - } - - err = n.Pinning.Flush() - if err != nil { - return err - } - pub := nsys.NewIpnsPublisher(n.Routing, n.Repo.Datastore()) return pub.Publish(ctx, key, path.FromCid(emptyDir.Cid())) diff --git a/go.mod b/go.mod index e10bb5c0dfb..1a7776e73aa 100644 --- a/go.mod +++ b/go.mod @@ -55,7 +55,7 @@ require ( github.com/ipfs/go-unixfs v0.0.8 github.com/ipfs/go-verifcid v0.0.1 github.com/ipfs/hang-fds v0.0.1 - github.com/ipfs/interface-go-ipfs-core v0.1.0 + github.com/ipfs/interface-go-ipfs-core v0.1.1-0.20190604142754-633b6fb8d182 github.com/ipfs/iptb v1.4.0 github.com/ipfs/iptb-plugins v0.1.0 github.com/jbenet/go-is-domain v1.0.2 @@ -74,6 +74,7 @@ require ( github.com/libp2p/go-libp2p-mplex v0.2.1 github.com/libp2p/go-libp2p-peerstore v0.1.0 github.com/libp2p/go-libp2p-pnet v0.1.0 + github.com/libp2p/go-libp2p-protocol v0.1.0 // indirect github.com/libp2p/go-libp2p-pubsub v0.1.0 github.com/libp2p/go-libp2p-pubsub-router v0.1.0 github.com/libp2p/go-libp2p-quic-transport v0.1.1 @@ -110,8 +111,11 @@ require ( go.uber.org/multierr v1.1.0 // indirect go4.org v0.0.0-20190313082347-94abd6928b1d // indirect golang.org/x/sys v0.0.0-20190526052359-791d8a0f4d09 + google.golang.org/appengine v1.4.0 // indirect gopkg.in/cheggaaa/pb.v1 v1.0.28 gotest.tools/gotestsum v0.3.4 ) +replace github.com/ipfs/interface-go-ipfs-core => /home/voker57/go/src/github.com/ipfs/interface-go-ipfs-core + go 1.12 diff --git a/go.sum b/go.sum index c404db021e0..ef70ab3d40b 100644 --- a/go.sum +++ b/go.sum @@ -17,6 +17,15 @@ github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrU github.com/Stebalien/go-bitfield v0.0.0-20180330043415-076a62f9ce6e/go.mod h1:3oM7gXIttpYDAJXpVNnSCiUMYBLIZ6cb1t+Ip982MRo= github.com/Stebalien/go-bitfield v0.0.1 h1:X3kbSSPUaJK60wV2hjOPZwmpljr6VGCqdq4cBLhbQBo= github.com/Stebalien/go-bitfield v0.0.1/go.mod h1:GNjFpasyUVkHMsfEOk8EFLJ9syQ6SI+XWrX9Wf2XH0s= +github.com/Voker57/interface-go-ipfs-core v0.1.1-0.20190604132113-424af290e7a3/go.mod h1:A4FAedv6iaOcZ7cnEkgZzcc0YKTSBvPskqF11S0SJRo= +github.com/Voker57/interface-go-ipfs-core v0.1.1-0.20190604142754-633b6fb8d182 h1:gUB1M5pRfhL0hcmT473WlXj+QmYE2aSdcxOS+9TfU1c= +github.com/Voker57/interface-go-ipfs-core v0.1.1-0.20190604142754-633b6fb8d182/go.mod h1:A4FAedv6iaOcZ7cnEkgZzcc0YKTSBvPskqF11S0SJRo= +github.com/Voker57/interface-go-ipfs-core v0.1.1-0.20190604144429-9280e67a9e57 h1:ksDiklcz65rb5pEMX+1oA7uGJWVZTp7uAES2zHntneI= +github.com/Voker57/interface-go-ipfs-core v0.1.1-0.20190604144429-9280e67a9e57/go.mod h1:A4FAedv6iaOcZ7cnEkgZzcc0YKTSBvPskqF11S0SJRo= +github.com/Voker57/interface-go-ipfs-core v0.1.1-0.20190606134441-03eb96486e0a h1:n5OOvZM99lQarzU+s69Mtcb5/Mf0jkQ58iTYoXMJsL0= +github.com/Voker57/interface-go-ipfs-core v0.1.1-0.20190606134441-03eb96486e0a/go.mod h1:oFvNTBBEL4dD1oQxrFWukm/UDg4DDdH+Ic1TvjltZUI= +github.com/Voker57/interface-go-ipfs-core v0.1.1-0.20190606134716-3ff07fdc2a40 h1:rX2hnM67L5x4YOd0t1fQyHeb5YySkK/LVHltmosdgLA= +github.com/Voker57/interface-go-ipfs-core v0.1.1-0.20190606134716-3ff07fdc2a40/go.mod h1:uj9Zs4i5i15pkXLb+FFeo3sznL9tHPWZBD3deNEqXvo= github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= @@ -43,6 +52,7 @@ github.com/cenkalti/backoff v2.1.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QH github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitfE= github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ= +github.com/cheekybits/is v0.0.0-20150225183255-68e9c0620927/go.mod h1:h/aW8ynjgkuj+NQRlZcDbAbM1ORAbXjXX77sX7T289U= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-semver v0.2.1-0.20180108230905-e214231b295a/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= @@ -228,6 +238,7 @@ github.com/ipfs/go-ds-measure v0.0.1 h1:PrCueug+yZLkDCOthZTXKinuoCal/GvlAT7cNxzr github.com/ipfs/go-ds-measure v0.0.1/go.mod h1:wiH6bepKsgyNKpz3nyb4erwhhIVpIxnZbsjN1QpVbbE= github.com/ipfs/go-fs-lock v0.0.1 h1:XHX8uW4jQBYWHj59XXcjg7BHlHxV9ZOYs6Y43yb7/l0= github.com/ipfs/go-fs-lock v0.0.1/go.mod h1:DNBekbboPKcxs1aukPSaOtFA3QfSdi5C855v0i9XJ8Y= +github.com/ipfs/go-ipfs-api v0.0.1/go.mod h1:0FhXgCzrLu7qNmdxZvgYqD9jFzJxzz1NAVt3OQ0WOIc= github.com/ipfs/go-ipfs-blockstore v0.0.1 h1:O9n3PbmTYZoNhkgkEyrXTznbmktIXif62xLX+8dPHzc= github.com/ipfs/go-ipfs-blockstore v0.0.1/go.mod h1:d3WClOmRQKFnJ0Jz/jj/zmksX0ma1gROTlovZKBmN08= github.com/ipfs/go-ipfs-blocksutil v0.0.1 h1:Eh/H4pc1hsvhzsQoMEP3Bke/aW5P5rVM1IWFJMcGIPQ= @@ -249,6 +260,7 @@ github.com/ipfs/go-ipfs-exchange-interface v0.0.1 h1:LJXIo9W7CAmugqI+uofioIpRb6r github.com/ipfs/go-ipfs-exchange-interface v0.0.1/go.mod h1:c8MwfHjtQjPoDyiy9cFquVtVHkO9b9Ob3FG91qJnWCM= github.com/ipfs/go-ipfs-exchange-offline v0.0.1 h1:P56jYKZF7lDDOLx5SotVh5KFxoY6C81I1NSHW1FxGew= github.com/ipfs/go-ipfs-exchange-offline v0.0.1/go.mod h1:WhHSFCVYX36H/anEKQboAzpUws3x7UeEGkzQc3iNkM0= +github.com/ipfs/go-ipfs-files v0.0.1/go.mod h1:INEFm0LL2LWXBhNJ2PMIIb2w45hpXgPjNoE7yA8Y1d4= github.com/ipfs/go-ipfs-files v0.0.2/go.mod h1:INEFm0LL2LWXBhNJ2PMIIb2w45hpXgPjNoE7yA8Y1d4= github.com/ipfs/go-ipfs-files v0.0.3 h1:ME+QnC3uOyla1ciRPezDW0ynQYK2ikOh9OCKAEg4uUA= github.com/ipfs/go-ipfs-files v0.0.3/go.mod h1:INEFm0LL2LWXBhNJ2PMIIb2w45hpXgPjNoE7yA8Y1d4= @@ -341,6 +353,7 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGi github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/koron/go-ssdp v0.0.0-20180514024734-4a0ed625a78b h1:wxtKgYHEncAU00muMD06dzLiahtGM1eouRNOzVV7tdQ= github.com/koron/go-ssdp v0.0.0-20180514024734-4a0ed625a78b/go.mod h1:5Ky9EC2xfoUKUor0Hjgi2BJhCSXJfMOFlmyYrVKGQMk= +github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= @@ -628,6 +641,7 @@ github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR github.com/rs/cors v1.6.0 h1:G9tHG9lebljV9mfp9SNPDL36nCDxmo3zTlAf1YgvzmI= github.com/rs/cors v1.6.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/ryanuber/go-glob v0.0.0-20170128012129-256dc444b735/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc= +github.com/sabhiram/go-gitignore v0.0.0-20180611051255-d3107576ba94/go.mod h1:b18R55ulyQ/h3RaWyloPyER7fWQVZvimKKhnI5OfrJQ= github.com/shirou/gopsutil v0.0.0-20180427012116-c95755e4bcd7/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod h1:qsXQc7+bwAM3Q1u/4XEfrquwF8Lw7D7y5cD8CuHnfIc= github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e h1:MZM7FHLqUHYI0Y/mQAt3d2aYa0SiNms/hFqC9qJYolM= @@ -692,12 +706,17 @@ github.com/whyrusleeping/go-smux-yamux v2.0.8+incompatible/go.mod h1:6qHUzBXUbB9 github.com/whyrusleeping/go-smux-yamux v2.0.9+incompatible/go.mod h1:6qHUzBXUbB9MXmw3AUdB52L8sEb/hScCqOdW2kj/wuI= github.com/whyrusleeping/go-sysinfo v0.0.0-20190219211824-4a357d4b90b1 h1:ctS9Anw/KozviCCtK6VWMz5kPL9nbQzbQY4yfqlIV4M= github.com/whyrusleeping/go-sysinfo v0.0.0-20190219211824-4a357d4b90b1/go.mod h1:tKH72zYNt/exx6/5IQO6L9LoQ0rEjd5SbbWaDTs9Zso= +github.com/whyrusleeping/gx v0.14.2/go.mod h1:e7k5R8Ndb9Ocdv8fWAeyg9uqjRuLl19xi/SvpGS0UuU= +github.com/whyrusleeping/gx-go v1.9.0/go.mod h1:GydEO1wfHtMs1NCsgW9ha01ZsJ9cfxaTBum3fQrXo0M= +github.com/whyrusleeping/json-filter v0.0.0-20160615203754-ff25329a9528/go.mod h1:5a88m1gFWhTL3QwRdNm1fiRNrBTME7Ch8f8pZZZes9g= github.com/whyrusleeping/mafmt v1.2.8 h1:TCghSl5kkwEE0j+sU/gudyhVMRlpBin8fMBBHg59EbA= github.com/whyrusleeping/mafmt v1.2.8/go.mod h1:faQJFPbLSxzD9xpA02ttW/tS9vZykNvXwGvqIpk20FA= github.com/whyrusleeping/mdns v0.0.0-20180901202407-ef14215e6b30 h1:nMCC9Pwz1pxfC1Y6mYncdk+kq8d5aLx0Q+/gyZGE44M= github.com/whyrusleeping/mdns v0.0.0-20180901202407-ef14215e6b30/go.mod h1:j4l84WPFclQPj320J9gp0XwNKBb3U0zt5CBqjPp22G4= github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7 h1:E9S12nwJwEOXe2d6gT6qxdvqMnNq+VnSsKPgm2ZZNds= github.com/whyrusleeping/multiaddr-filter v0.0.0-20160516205228-e903e4adabd7/go.mod h1:X2c0RVCI1eSUFI8eLcY3c0423ykwiUdxLJtkDvruhjI= +github.com/whyrusleeping/progmeter v0.0.0-20180725015555-f3e57218a75b/go.mod h1:gyCeSVnUb+LQh0QCWbg0Sl30ckl2YgNC+yvSFvy5mFY= +github.com/whyrusleeping/stump v0.0.0-20160611222256-206f8f13aae1/go.mod h1:Qv7QS+Xqv+q5lhOfseae0ZWF0wliLmab2hmikKoLhgE= github.com/whyrusleeping/tar-utils v0.0.0-20180509141711-8c6c8ba81d5c h1:GGsyl0dZ2jJgVT+VvWBf/cNijrHRhkrTjkmp5wg7li0= github.com/whyrusleeping/tar-utils v0.0.0-20180509141711-8c6c8ba81d5c/go.mod h1:xxcJeBb7SIUl/Wzkz1eVKJE/CB34YNrqX2TQI6jY9zs= github.com/whyrusleeping/timecache v0.0.0-20160911033111-cfcb2f1abfee h1:lYbXeSvJi5zk5GLKVuid9TVjS9a0OmLIDKTfoZBL6Ow= diff --git a/namesys/publisher.go b/namesys/publisher.go index c06deb795ae..58d957e7ea1 100644 --- a/namesys/publisher.go +++ b/namesys/publisher.go @@ -291,18 +291,6 @@ func PublishEntry(ctx context.Context, r routing.ValueStore, ipnskey string, rec func InitializeKeyspace(ctx context.Context, pub Publisher, pins pin.Pinner, key ci.PrivKey) error { emptyDir := ft.EmptyDirNode() - // pin recursively because this might already be pinned - // and doing a direct pin would throw an error in that case - err := pins.Pin(ctx, emptyDir, true) - if err != nil { - return err - } - - err = pins.Flush() - if err != nil { - return err - } - return pub.Publish(ctx, key, path.FromCid(emptyDir.Cid())) } diff --git a/pin/gc/gc.go b/pin/gc/gc.go index bf8b7b10fa1..4fb44126cea 100644 --- a/pin/gc/gc.go +++ b/pin/gc/gc.go @@ -203,13 +203,19 @@ func ColoredSet(ctx context.Context, pn pin.Pinner, ng ipld.NodeGetter, bestEffo } return links, nil } - err := Descendants(ctx, getLinks, gcs, pn.RecursiveKeys()) + recursiveKeys, err := pn.PinnedCids(true) if err != nil { errors = true - select { - case output <- Result{Error: err}: - case <-ctx.Done(): - return nil, ctx.Err() + output <- Result{Error: err} + } else { + err := Descendants(ctx, getLinks, gcs, recursiveKeys) + if err != nil { + errors = true + select { + case output <- Result{Error: err}: + case <-ctx.Done(): + return nil, ctx.Err() + } } } @@ -235,11 +241,7 @@ func ColoredSet(ctx context.Context, pn pin.Pinner, ng ipld.NodeGetter, bestEffo } } - for _, k := range pn.DirectKeys() { - gcs.Add(k) - } - - err = Descendants(ctx, getLinks, gcs, pn.InternalPins()) + directKeys, err := pn.PinnedCids(false) if err != nil { errors = true select { @@ -249,6 +251,10 @@ func ColoredSet(ctx context.Context, pn pin.Pinner, ng ipld.NodeGetter, bestEffo } } + for _, k := range directKeys { + gcs.Add(k) + } + if errors { return nil, ErrCannotFetchAllLinks } diff --git a/pin/pin.go b/pin/pin.go index 8df21ee1ce3..40e39adda6c 100644 --- a/pin/pin.go +++ b/pin/pin.go @@ -5,43 +5,20 @@ package pin import ( "context" "fmt" - "os" - "sync" - "time" "github.com/ipfs/go-ipfs/dagutils" mdag "github.com/ipfs/go-merkledag" cid "github.com/ipfs/go-cid" ds "github.com/ipfs/go-datastore" + dsq "github.com/ipfs/go-datastore/query" ipld "github.com/ipfs/go-ipld-format" logging "github.com/ipfs/go-log" ) var log = logging.Logger("pin") -var pinDatastoreKey = ds.NewKey("/local/pins") - -var emptyKey cid.Cid - -func init() { - e, err := cid.Decode("QmdfTbBqBPQ7VNxZEYEj14VmRuZBkqFbiwReogJgS1zR1n") - if err != nil { - log.Error("failed to decode empty key constant") - os.Exit(1) - } - emptyKey = e -} - -const ( - linkRecursive = "recursive" - linkDirect = "direct" - linkIndirect = "indirect" - linkInternal = "internal" - linkNotPinned = "not pinned" - linkAny = "any" - linkAll = "all" -) +var pinDatastoreKey = "/local/pins" // Mode allows to specify different types of pin (recursive, direct etc.). // See the Pin Modes constants for a full list. @@ -58,46 +35,10 @@ const ( // Indirect pins are cids who have some ancestor pinned recursively. Indirect - // Internal pins are cids used to keep the internal state of the pinner. - Internal - // NotPinned NotPinned - - // Any refers to any pinned cid - Any ) -// ModeToString returns a human-readable name for the Mode. -func ModeToString(mode Mode) (string, bool) { - m := map[Mode]string{ - Recursive: linkRecursive, - Direct: linkDirect, - Indirect: linkIndirect, - Internal: linkInternal, - NotPinned: linkNotPinned, - Any: linkAny, - } - s, ok := m[mode] - return s, ok -} - -// StringToMode parses the result of ModeToString() back to a Mode. -// It returns a boolean which is set to false if the mode is unknown. -func StringToMode(s string) (Mode, bool) { - m := map[string]Mode{ - linkRecursive: Recursive, - linkDirect: Direct, - linkIndirect: Indirect, - linkInternal: Internal, - linkNotPinned: NotPinned, - linkAny: Any, - linkAll: Any, // "all" and "any" means the same thing - } - mode, ok := m[s] - return mode, ok -} - // A Pinner provides the necessary methods to keep track of Nodes which are // to be kept locally, according to a pin mode. In practice, a Pinner is in // in charge of keeping the list of items from the local storage that should @@ -107,48 +48,41 @@ type Pinner interface { // and an explanation of why its pinned IsPinned(cid.Cid) (string, bool, error) - // IsPinnedWithType returns whether or not the given cid is pinned with the - // given pin type, as well as returning the type of pin its pinned with. - IsPinnedWithType(cid.Cid, Mode) (string, bool, error) + // GetPin returns cid pinned at given path + GetPin(path string, recursive bool) (*cid.Cid, error) // Pin the given node, optionally recursively. - Pin(ctx context.Context, node ipld.Node, recursive bool) error + Pin(ctx context.Context, path string, node ipld.Node, recursive bool) error + + // Unpin the given path with given mode. + Unpin(path string, recursive bool) error - // Unpin the given cid. If recursive is true, removes either a recursive or - // a direct pin. If recursive is false, only removes a direct pin. - Unpin(ctx context.Context, cid cid.Cid, recursive bool) error + // Unpin the given cid with given mode. + UnpinCid(cid cid.Cid, recursive bool) error + + UnpinCidUnderPrefix(path string, c cid.Cid, recursive bool) error // Update updates a recursive pin from one cid to another // this is more efficient than simply pinning the new one and unpinning the // old one - Update(ctx context.Context, from, to cid.Cid, unpin bool) error + Update(ctx context.Context, path string, to cid.Cid) error + + // Check if given cid is pinned with given mode, return pin path + IsPinPresent(cid cid.Cid, recursive bool) (string, error) // Check if a set of keys are pinned, more efficient than // calling IsPinned for each key CheckIfPinned(cids ...cid.Cid) ([]Pinned, error) - // PinWithMode is for manually editing the pin structure. Use with + // AddPin is for manually editing the pin structure. Use with // care! If used improperly, garbage collection may not be // successful. - PinWithMode(cid.Cid, Mode) - - // RemovePinWithMode is for manually editing the pin structure. - // Use with care! If used improperly, garbage collection may not - // be successful. - RemovePinWithMode(cid.Cid, Mode) - - // Flush writes the pin state to the backing datastore - Flush() error + AddPin(path string, cid cid.Cid, recursive bool) error - // DirectKeys returns all directly pinned cids - DirectKeys() []cid.Cid + // PinnedCids returns all pinned cids (recursive or direct) + PinnedCids(recursive bool) ([]cid.Cid, error) - // DirectKeys returns all recursively pinned cids - RecursiveKeys() []cid.Cid - - // InternalPins returns all cids kept pinned for the internal state of the - // pinner - InternalPins() []cid.Cid + PrefixedPins(prefix string, recursive bool) (map[string]cid.Cid, error) } // Pinned represents CID which has been pinned with a pinning strategy. @@ -158,6 +92,7 @@ type Pinner interface { type Pinned struct { Key cid.Cid Mode Mode + Path string Via cid.Cid } @@ -168,51 +103,44 @@ func (p Pinned) Pinned() bool { // String Returns pin status as string func (p Pinned) String() string { + var result string switch p.Mode { case NotPinned: - return "not pinned" + result = "not pinned" case Indirect: - return fmt.Sprintf("pinned via %s", p.Via) - default: - modeStr, _ := ModeToString(p.Mode) - return fmt.Sprintf("pinned: %s", modeStr) + result = fmt.Sprintf("pinned under %s via %s", p.Path, p.Via) + case Recursive: + result = fmt.Sprintf("pinned under %s recursively", p.Path) + case Direct: + result = fmt.Sprintf("pinned under %s directly", p.Path) } + return result } // pinner implements the Pinner interface type pinner struct { - lock sync.RWMutex - recursePin *cid.Set - directPin *cid.Set - - // Track the keys used for storing the pinning state, so gc does - // not delete them. - internalPin *cid.Set - dserv ipld.DAGService - internal ipld.DAGService // dagservice used to store internal objects - dstore ds.Datastore + dserv ipld.DAGService + dstore ds.Datastore } // NewPinner creates a new pinner using the given datastore as a backend -func NewPinner(dstore ds.Datastore, serv, internal ipld.DAGService) Pinner { - - rcset := cid.NewSet() - dirset := cid.NewSet() +func NewPinner(dserv ipld.DAGService, dstore ds.Datastore) Pinner { + return &pinner{dserv: dserv, dstore: dstore} +} - return &pinner{ - recursePin: rcset, - directPin: dirset, - dserv: serv, - dstore: dstore, - internal: internal, - internalPin: cid.NewSet(), +// Pin the given node, optionally recursive +// If path ends with /, cid will be appended to path. +func (p *pinner) AddPin(path string, c cid.Cid, recursive bool) error { + if len(path) == 0 || path[len(path)-1] == '/' { + path += c.String() } + return p.dstore.Put(ds.NewKey(pathToDSKey(path, recursive)), c.Bytes()) } // Pin the given node, optionally recursive -func (p *pinner) Pin(ctx context.Context, node ipld.Node, recurse bool) error { - p.lock.Lock() - defer p.lock.Unlock() +// Also fetches its data +// If path ends with /, cid will be appended to path. +func (p *pinner) Pin(ctx context.Context, path string, node ipld.Node, recurse bool) error { err := p.dserv.Add(ctx, node) if err != nil { return err @@ -221,157 +149,136 @@ func (p *pinner) Pin(ctx context.Context, node ipld.Node, recurse bool) error { c := node.Cid() if recurse { - if p.recursePin.Has(c) { - return nil - } - - if p.directPin.Has(c) { - p.directPin.Remove(c) - } - p.lock.Unlock() // fetch entire graph err := mdag.FetchGraph(ctx, c, p.dserv) - p.lock.Lock() if err != nil { return err } - - if p.recursePin.Has(c) { - return nil - } - - if p.directPin.Has(c) { - p.directPin.Remove(c) - } - - p.recursePin.Add(c) } else { - p.lock.Unlock() _, err := p.dserv.Get(ctx, c) - p.lock.Lock() if err != nil { return err } + } - if p.recursePin.Has(c) { - return fmt.Errorf("%s already pinned recursively", c.String()) - } + return p.AddPin(path, c, recurse) +} + +func (p *pinner) GetPin(path string, recursive bool) (*cid.Cid, error) { + bytes, err := p.dstore.Get(ds.NewKey(pathToDSKey(path, recursive))) + if err == ds.ErrNotFound { + return nil, ErrNotPinned + } else if err != nil { + return nil, err + } - p.directPin.Add(c) + cid, err := cid.Cast(bytes) + if err != nil { + return nil, err } - return nil + return &cid, nil } // ErrNotPinned is returned when trying to unpin items which are not pinned. var ErrNotPinned = fmt.Errorf("not pinned or pinned indirectly") // Unpin a given key -func (p *pinner) Unpin(ctx context.Context, c cid.Cid, recursive bool) error { - p.lock.Lock() - defer p.lock.Unlock() - if p.recursePin.Has(c) { - if !recursive { - return fmt.Errorf("%s is pinned recursively", c) - } - p.recursePin.Remove(c) - return nil - } - if p.directPin.Has(c) { - p.directPin.Remove(c) - return nil +func (p *pinner) Unpin(path string, recursive bool) error { + _, err := p.GetPin(path, recursive) + if err != nil { + return err } - return ErrNotPinned -} -func (p *pinner) isInternalPin(c cid.Cid) bool { - return p.internalPin.Has(c) + return p.dstore.Delete(ds.NewKey(pathToDSKey(path, recursive))) } -// IsPinned returns whether or not the given key is pinned -// and an explanation of why its pinned -func (p *pinner) IsPinned(c cid.Cid) (string, bool, error) { - p.lock.RLock() - defer p.lock.RUnlock() - return p.isPinnedWithType(c, Any) -} +// Unpin a given cid pinned under given prefix +// e.g UCUP("/temp/", QmAFobaz... will unpin /temp/QmAFobaz +// If path does not end in a slash, just acts as Unpin() +func (p *pinner) UnpinCidUnderPrefix(path string, c cid.Cid, recursive bool) error { + if path[len(path)-1] == '/' { + path += c.String() + } + _, err := p.GetPin(path, recursive) + if err != nil { + return err + } -// IsPinnedWithType returns whether or not the given cid is pinned with the -// given pin type, as well as returning the type of pin its pinned with. -func (p *pinner) IsPinnedWithType(c cid.Cid, mode Mode) (string, bool, error) { - p.lock.RLock() - defer p.lock.RUnlock() - return p.isPinnedWithType(c, mode) + return p.dstore.Delete(ds.NewKey(pathToDSKey(path, recursive))) } -// isPinnedWithType is the implementation of IsPinnedWithType that does not lock. -// intended for use by other pinned methods that already take locks -func (p *pinner) isPinnedWithType(c cid.Cid, mode Mode) (string, bool, error) { - switch mode { - case Any, Direct, Indirect, Recursive, Internal: - default: - err := fmt.Errorf("invalid Pin Mode '%d', must be one of {%d, %d, %d, %d, %d}", - mode, Direct, Indirect, Recursive, Internal, Any) - return "", false, err - } - if (mode == Recursive || mode == Any) && p.recursePin.Has(c) { - return linkRecursive, true, nil - } - if mode == Recursive { - return "", false, nil +func pinKeyPrefix(recursive bool) string { + prefix := "direct" + if recursive { + prefix = "recursive" } + return pinDatastoreKey + "/" + prefix + "/" +} +func pathToDSKey(path string, recursive bool) string { + return pinKeyPrefix(recursive) + path +} - if (mode == Direct || mode == Any) && p.directPin.Has(c) { - return linkDirect, true, nil +func (p *pinner) IsPinPresent(cid cid.Cid, recursive bool) (string, error) { + pinMap, err := p.PrefixedPins("", recursive) + if err != nil { + return "", err } - if mode == Direct { - return "", false, nil + for path, c := range pinMap { + if c == cid { + return path, nil + } } + return "", ErrNotPinned +} - if (mode == Internal || mode == Any) && p.isInternalPin(c) { - return linkInternal, true, nil - } - if mode == Internal { - return "", false, nil +func (p *pinner) IsPinned(cid cid.Cid) (string, bool, error) { + pinneds, err := p.CheckIfPinned(cid) + if err != nil { + return "", false, err } - - // Default is Indirect - visitedSet := cid.NewSet() - for _, rc := range p.recursePin.Keys() { - has, err := hasChild(p.dserv, rc, c, visitedSet.Visit) - if err != nil { - return "", false, err - } - if has { - return rc.String(), true, nil - } + if len(pinneds) != 1 { + return "", false, fmt.Errorf("CheckIfPinned returned %d results instead of 1", len(pinneds)) } - return "", false, nil + return pinneds[0].String(), pinneds[0].Pinned(), nil } // CheckIfPinned Checks if a set of keys are pinned, more efficient than // calling IsPinned for each key, returns the pinned status of cid(s) func (p *pinner) CheckIfPinned(cids ...cid.Cid) ([]Pinned, error) { - p.lock.RLock() - defer p.lock.RUnlock() + recursiveMap, err := p.PrefixedPins("", true) + if err != nil { + return nil, err + } + directMap, err := p.PrefixedPins("", false) + if err != nil { + return nil, err + } pinned := make([]Pinned, 0, len(cids)) toCheck := cid.NewSet() - // First check for non-Indirect pins directly for _, c := range cids { - if p.recursePin.Has(c) { - pinned = append(pinned, Pinned{Key: c, Mode: Recursive}) - } else if p.directPin.Has(c) { - pinned = append(pinned, Pinned{Key: c, Mode: Direct}) - } else if p.isInternalPin(c) { - pinned = append(pinned, Pinned{Key: c, Mode: Internal}) - } else { - toCheck.Add(c) + toCheck.Visit(c) + } + + if toCheck.Len() == 0 { + return pinned, nil + } + + for path, c := range directMap { + if toCheck.Has(c) { + pinned = append(pinned, + Pinned{Key: c, Mode: Direct, Path: path}) + toCheck.Remove(c) } } + if toCheck.Len() == 0 { + return pinned, nil + } + // Now walk all recursive pins to check for indirect pins - var checkChildren func(cid.Cid, cid.Cid) error - checkChildren = func(rk, parentKey cid.Cid) error { + var checkChildren func(string, cid.Cid, cid.Cid) error + checkChildren = func(path string, rk, parentKey cid.Cid) error { links, err := ipld.GetLinks(context.TODO(), p.dserv, parentKey) if err != nil { return err @@ -381,11 +288,11 @@ func (p *pinner) CheckIfPinned(cids ...cid.Cid) ([]Pinned, error) { if toCheck.Has(c) { pinned = append(pinned, - Pinned{Key: c, Mode: Indirect, Via: rk}) + Pinned{Key: c, Mode: Indirect, Via: rk, Path: path}) toCheck.Remove(c) } - err := checkChildren(rk, c) + err := checkChildren(path, rk, c) if err != nil { return err } @@ -397,8 +304,14 @@ func (p *pinner) CheckIfPinned(cids ...cid.Cid) ([]Pinned, error) { return nil } - for _, rk := range p.recursePin.Keys() { - err := checkChildren(rk, rk) + for path, rk := range recursiveMap { + if toCheck.Has(rk) { + pinned = append(pinned, + Pinned{Key: rk, Mode: Recursive, Path: path}) + toCheck.Remove(rk) + } + + err := checkChildren(path, rk, rk) if err != nil { return nil, err } @@ -415,23 +328,6 @@ func (p *pinner) CheckIfPinned(cids ...cid.Cid) ([]Pinned, error) { return pinned, nil } -// RemovePinWithMode is for manually editing the pin structure. -// Use with care! If used improperly, garbage collection may not -// be successful. -func (p *pinner) RemovePinWithMode(c cid.Cid, mode Mode) { - p.lock.Lock() - defer p.lock.Unlock() - switch mode { - case Direct: - p.directPin.Remove(c) - case Recursive: - p.recursePin.Remove(c) - default: - // programmer error, panic OK - panic("unrecognized pin type") - } -} - func cidSetWithValues(cids []cid.Cid) *cid.Set { out := cid.NewSet() for _, c := range cids { @@ -440,168 +336,49 @@ func cidSetWithValues(cids []cid.Cid) *cid.Set { return out } -// LoadPinner loads a pinner and its keysets from the given datastore -func LoadPinner(d ds.Datastore, dserv, internal ipld.DAGService) (Pinner, error) { - p := new(pinner) +// PrefixedPins returns a map containing all pins of given kind under given prefix +func (p *pinner) PrefixedPins(prefix string, recursive bool) (map[string]cid.Cid, error) { + result, err := p.dstore.Query(dsq.Query{Prefix: pathToDSKey(prefix, recursive)}) - rootKey, err := d.Get(pinDatastoreKey) - if err != nil { - return nil, fmt.Errorf("cannot load pin state: %v", err) - } - rootCid, err := cid.Cast(rootKey) if err != nil { return nil, err } - ctx, cancel := context.WithTimeout(context.TODO(), time.Second*5) - defer cancel() + pinMap := make(map[string]cid.Cid) - root, err := internal.Get(ctx, rootCid) - if err != nil { - return nil, fmt.Errorf("cannot find pinning root object: %v", err) - } - - rootpb, ok := root.(*mdag.ProtoNode) - if !ok { - return nil, mdag.ErrNotProtobuf - } - - internalset := cid.NewSet() - internalset.Add(rootCid) - recordInternal := internalset.Add - - { // load recursive set - recurseKeys, err := loadSet(ctx, internal, rootpb, linkRecursive, recordInternal) + for entry := range result.Next() { + c, err := cid.Cast(entry.Value) if err != nil { - return nil, fmt.Errorf("cannot load recursive pins: %v", err) + return nil, err } - p.recursePin = cidSetWithValues(recurseKeys) - } - { // load direct set - directKeys, err := loadSet(ctx, internal, rootpb, linkDirect, recordInternal) - if err != nil { - return nil, fmt.Errorf("cannot load direct pins: %v", err) - } - p.directPin = cidSetWithValues(directKeys) + pinMap[entry.Key[len(pinKeyPrefix(recursive)):]] = c } - - p.internalPin = internalset - - // assign services - p.dserv = dserv - p.dstore = d - p.internal = internal - - return p, nil + return pinMap, nil } -// DirectKeys returns a slice containing the directly pinned keys -func (p *pinner) DirectKeys() []cid.Cid { - return p.directPin.Keys() -} - -// RecursiveKeys returns a slice containing the recursively pinned keys -func (p *pinner) RecursiveKeys() []cid.Cid { - return p.recursePin.Keys() -} - -// Update updates a recursive pin from one cid to another +// Update updates a pin from one cid to another // this is more efficient than simply pinning the new one and unpinning the // old one -func (p *pinner) Update(ctx context.Context, from, to cid.Cid, unpin bool) error { - p.lock.Lock() - defer p.lock.Unlock() +func (p *pinner) Update(ctx context.Context, path string, to cid.Cid) error { - if !p.recursePin.Has(from) { - return fmt.Errorf("'from' cid was not recursively pinned already") - } - - err := dagutils.DiffEnumerate(ctx, p.dserv, from, to) + c, err := p.GetPin(path, true) if err != nil { return err } - p.recursePin.Add(to) - if unpin { - p.recursePin.Remove(from) - } - return nil -} - -// Flush encodes and writes pinner keysets to the datastore -func (p *pinner) Flush() error { - p.lock.Lock() - defer p.lock.Unlock() - - ctx := context.TODO() - - internalset := cid.NewSet() - recordInternal := internalset.Add - - root := &mdag.ProtoNode{} - { - n, err := storeSet(ctx, p.internal, p.directPin.Keys(), recordInternal) - if err != nil { - return err - } - if err := root.AddNodeLink(linkDirect, n); err != nil { - return err - } - } - - { - n, err := storeSet(ctx, p.internal, p.recursePin.Keys(), recordInternal) - if err != nil { - return err - } - if err := root.AddNodeLink(linkRecursive, n); err != nil { - return err - } - } - - // add the empty node, its referenced by the pin sets but never created - err := p.internal.Add(ctx, new(mdag.ProtoNode)) + err = dagutils.DiffEnumerate(ctx, p.dserv, *c, to) if err != nil { return err } - err = p.internal.Add(ctx, root) + err = p.Unpin(path, true) if err != nil { return err } - k := root.Cid() + return p.AddPin(path, to, true) - internalset.Add(k) - if err := p.dstore.Put(pinDatastoreKey, k.Bytes()); err != nil { - return fmt.Errorf("cannot store pin state: %v", err) - } - p.internalPin = internalset - return nil -} - -// InternalPins returns all cids kept pinned for the internal state of the -// pinner -func (p *pinner) InternalPins() []cid.Cid { - p.lock.Lock() - defer p.lock.Unlock() - var out []cid.Cid - out = append(out, p.internalPin.Keys()...) - return out -} - -// PinWithMode allows the user to have fine grained control over pin -// counts -func (p *pinner) PinWithMode(c cid.Cid, mode Mode) { - p.lock.Lock() - defer p.lock.Unlock() - switch mode { - case Recursive: - p.recursePin.Add(c) - case Direct: - p.directPin.Add(c) - } } // hasChild recursively looks for a Cid among the children of a root Cid. @@ -629,3 +406,23 @@ func hasChild(ng ipld.NodeGetter, root cid.Cid, child cid.Cid, visit func(cid.Ci } return false, nil } + +func (p *pinner) PinnedCids(recursive bool) ([]cid.Cid, error) { + pinMap, err := p.PrefixedPins("", recursive) + if err != nil { + return nil, err + } + var cids []cid.Cid + for _, v := range pinMap { + cids = append(cids, v) + } + return cids, nil +} + +func (p *pinner) UnpinCid(cid cid.Cid, recursive bool) error { + path, err := p.IsPinPresent(cid, recursive) + if err != nil { + return err + } + return p.Unpin(path, recursive) +} diff --git a/pin/pin_test.go b/pin/pin_test.go index 27e4c71dee5..f7fdee8d020 100644 --- a/pin/pin_test.go +++ b/pin/pin_test.go @@ -17,6 +17,8 @@ import ( util "github.com/ipfs/go-ipfs-util" ) +var test_prefix = "test/" + var rand = util.NewTimeSeededRand() func randNode() (*mdag.ProtoNode, cid.Cid) { @@ -62,7 +64,7 @@ func TestPinnerBasic(t *testing.T) { dserv := mdag.NewDAGService(bserv) // TODO does pinner need to share datastore with blockservice? - p := NewPinner(dstore, dserv, dserv) + p := NewPinner(dserv, dstore) a, ak := randNode() err := dserv.Add(ctx, a) @@ -71,7 +73,7 @@ func TestPinnerBasic(t *testing.T) { } // Pin A{} - err = p.Pin(ctx, a, false) + err = p.Pin(ctx, test_prefix, a, false) if err != nil { t.Fatal(err) } @@ -105,7 +107,7 @@ func TestPinnerBasic(t *testing.T) { bk := b.Cid() // recursively pin B{A,C} - err = p.Pin(ctx, b, true) + err = p.Pin(ctx, test_prefix, b, true) if err != nil { t.Fatal(err) } @@ -132,7 +134,7 @@ func TestPinnerBasic(t *testing.T) { } // Add D{A,C,E} - err = p.Pin(ctx, d, true) + err = p.Pin(ctx, test_prefix, d, true) if err != nil { t.Fatal(err) } @@ -141,20 +143,12 @@ func TestPinnerBasic(t *testing.T) { assertPinned(t, p, dk, "pinned node not found.") // Test recursive unpin - err = p.Unpin(ctx, dk, true) - if err != nil { - t.Fatal(err) - } - - err = p.Flush() + err = p.UnpinCidUnderPrefix(test_prefix, dk, true) if err != nil { t.Fatal(err) } - np, err := LoadPinner(dstore, dserv, dserv) - if err != nil { - t.Fatal(err) - } + np := NewPinner(dserv, dstore) // Test directly pinned assertPinned(t, np, ak, "Could not find pinned node!") @@ -188,7 +182,7 @@ func TestIsPinnedLookup(t *testing.T) { dserv := mdag.NewDAGService(bserv) // TODO does pinner need to share datastore with blockservice? - p := NewPinner(dstore, dserv, dserv) + p := NewPinner(dserv, dstore) aNodes := make([]*mdag.ProtoNode, aBranchLen) aKeys := make([]cid.Cid, aBranchLen) @@ -211,7 +205,7 @@ func TestIsPinnedLookup(t *testing.T) { } // Pin A5 recursively - if err := p.Pin(ctx, aNodes[aBranchLen-1], true); err != nil { + if err := p.Pin(ctx, test_prefix, aNodes[aBranchLen-1], true); err != nil { t.Fatal(err) } @@ -249,13 +243,13 @@ func TestIsPinnedLookup(t *testing.T) { // Pin C recursively - if err := p.Pin(ctx, c, true); err != nil { + if err := p.Pin(ctx, test_prefix, c, true); err != nil { t.Fatal(err) } // Pin B recursively - if err := p.Pin(ctx, b, true); err != nil { + if err := p.Pin(ctx, test_prefix, b, true); err != nil { t.Fatal(err) } @@ -265,7 +259,7 @@ func TestIsPinnedLookup(t *testing.T) { assertPinned(t, p, bk, "B should be pinned") // Unpin A5 recursively - if err := p.Unpin(ctx, aKeys[5], true); err != nil { + if err := p.UnpinCidUnderPrefix(test_prefix, aKeys[5], true); err != nil { t.Fatal(err) } @@ -273,7 +267,7 @@ func TestIsPinnedLookup(t *testing.T) { assertUnpinned(t, p, aKeys[4], "A4 should be unpinned") // Unpin B recursively - if err := p.Unpin(ctx, bk, true); err != nil { + if err := p.UnpinCidUnderPrefix(test_prefix, bk, true); err != nil { t.Fatal(err) } assertUnpinned(t, p, bk, "B should be unpinned") @@ -290,7 +284,7 @@ func TestDuplicateSemantics(t *testing.T) { dserv := mdag.NewDAGService(bserv) // TODO does pinner need to share datastore with blockservice? - p := NewPinner(dstore, dserv, dserv) + p := NewPinner(dserv, dstore) a, _ := randNode() err := dserv.Add(ctx, a) @@ -299,38 +293,22 @@ func TestDuplicateSemantics(t *testing.T) { } // pin is recursively - err = p.Pin(ctx, a, true) + err = p.Pin(ctx, test_prefix, a, true) if err != nil { t.Fatal(err) } - // pinning directly should fail - err = p.Pin(ctx, a, false) - if err == nil { - t.Fatal("expected direct pin to fail") - } - - // pinning recursively again should succeed - err = p.Pin(ctx, a, true) + // pinning directly should succeed + err = p.Pin(ctx, test_prefix, a, false) if err != nil { t.Fatal(err) } -} -func TestFlush(t *testing.T) { - dstore := dssync.MutexWrap(ds.NewMapDatastore()) - bstore := blockstore.NewBlockstore(dstore) - bserv := bs.New(bstore, offline.Exchange(bstore)) - - dserv := mdag.NewDAGService(bserv) - p := NewPinner(dstore, dserv, dserv) - _, k := randNode() - - p.PinWithMode(k, Recursive) - if err := p.Flush(); err != nil { + // pinning recursively again should still not fail + err = p.Pin(ctx, test_prefix, a, true) + if err != nil { t.Fatal(err) } - assertPinned(t, p, k, "expected key to still be pinned") } func TestPinRecursiveFail(t *testing.T) { @@ -340,7 +318,7 @@ func TestPinRecursiveFail(t *testing.T) { bserv := bs.New(bstore, offline.Exchange(bstore)) dserv := mdag.NewDAGService(bserv) - p := NewPinner(dstore, dserv, dserv) + p := NewPinner(dserv, dstore) a, _ := randNode() b, _ := randNode() @@ -353,7 +331,7 @@ func TestPinRecursiveFail(t *testing.T) { mctx, cancel := context.WithTimeout(ctx, time.Millisecond) defer cancel() - err = p.Pin(mctx, a, true) + err = p.Pin(mctx, test_prefix, a, true) if err == nil { t.Fatal("should have failed to pin here") } @@ -371,7 +349,7 @@ func TestPinRecursiveFail(t *testing.T) { // this one is time based... but shouldnt cause any issues mctx, cancel = context.WithTimeout(ctx, time.Second) defer cancel() - err = p.Pin(mctx, a, true) + err = p.Pin(mctx, test_prefix, a, true) if err != nil { t.Fatal(err) } @@ -385,7 +363,7 @@ func TestPinUpdate(t *testing.T) { bserv := bs.New(bstore, offline.Exchange(bstore)) dserv := mdag.NewDAGService(bserv) - p := NewPinner(dstore, dserv, dserv) + p := NewPinner(dserv, dstore) n1, c1 := randNode() n2, c2 := randNode() @@ -396,21 +374,21 @@ func TestPinUpdate(t *testing.T) { t.Fatal(err) } - if err := p.Pin(ctx, n1, true); err != nil { + if err := p.Pin(ctx, test_prefix, n1, true); err != nil { t.Fatal(err) } - if err := p.Update(ctx, c1, c2, true); err != nil { + if err := p.Update(ctx, test_prefix+c1.String(), c2); err != nil { t.Fatal(err) } assertPinned(t, p, c2, "c2 should be pinned now") assertUnpinned(t, p, c1, "c1 should no longer be pinned") - if err := p.Update(ctx, c2, c1, false); err != nil { + if err := p.Update(ctx, test_prefix+c1.String(), c1); err != nil { t.Fatal(err) } - assertPinned(t, p, c2, "c2 should be pinned still") + assertUnpinned(t, p, c2, "c2 should no longer be pinned") assertPinned(t, p, c1, "c1 should be pinned now") } diff --git a/pin/set.go b/pin/set.go deleted file mode 100644 index b050c31c43b..00000000000 --- a/pin/set.go +++ /dev/null @@ -1,297 +0,0 @@ -package pin - -import ( - "bytes" - "context" - "encoding/binary" - "errors" - "fmt" - "hash/fnv" - "sort" - - "github.com/ipfs/go-ipfs/pin/internal/pb" - "github.com/ipfs/go-merkledag" - - "github.com/gogo/protobuf/proto" - cid "github.com/ipfs/go-cid" - ipld "github.com/ipfs/go-ipld-format" -) - -const ( - // defaultFanout specifies the default number of fan-out links per layer - defaultFanout = 256 - - // maxItems is the maximum number of items that will fit in a single bucket - maxItems = 8192 -) - -func hash(seed uint32, c cid.Cid) uint32 { - var buf [4]byte - binary.LittleEndian.PutUint32(buf[:], seed) - h := fnv.New32a() - _, _ = h.Write(buf[:]) - _, _ = h.Write(c.Bytes()) - return h.Sum32() -} - -type itemIterator func() (c cid.Cid, ok bool) - -type keyObserver func(cid.Cid) - -type sortByHash struct { - links []*ipld.Link -} - -func (s sortByHash) Len() int { - return len(s.links) -} - -func (s sortByHash) Less(a, b int) bool { - return bytes.Compare(s.links[a].Cid.Bytes(), s.links[b].Cid.Bytes()) == -1 -} - -func (s sortByHash) Swap(a, b int) { - s.links[a], s.links[b] = s.links[b], s.links[a] -} - -func storeItems(ctx context.Context, dag ipld.DAGService, estimatedLen uint64, depth uint32, iter itemIterator, internalKeys keyObserver) (*merkledag.ProtoNode, error) { - links := make([]*ipld.Link, 0, defaultFanout+maxItems) - for i := 0; i < defaultFanout; i++ { - links = append(links, &ipld.Link{Cid: emptyKey}) - } - - // add emptyKey to our set of internal pinset objects - n := &merkledag.ProtoNode{} - n.SetLinks(links) - - internalKeys(emptyKey) - - hdr := &pb.Set{ - Version: 1, - Fanout: defaultFanout, - Seed: depth, - } - if err := writeHdr(n, hdr); err != nil { - return nil, err - } - - if estimatedLen < maxItems { - // it'll probably fit - links := n.Links() - for i := 0; i < maxItems; i++ { - k, ok := iter() - if !ok { - // all done - break - } - - links = append(links, &ipld.Link{Cid: k}) - } - - n.SetLinks(links) - - // sort by hash, also swap item Data - s := sortByHash{ - links: n.Links()[defaultFanout:], - } - sort.Stable(s) - } - - hashed := make([][]cid.Cid, defaultFanout) - for { - // This loop essentially enumerates every single item in the set - // and maps them all into a set of buckets. Each bucket will be recursively - // turned into its own sub-set, and so on down the chain. Each sub-set - // gets added to the dagservice, and put into its place in a set nodes - // links array. - // - // Previously, the bucket was selected by taking an int32 from the hash of - // the input key + seed. This was erroneous as we would later be assigning - // the created sub-sets into an array of length 256 by the modulus of the - // int32 hash value with 256. This resulted in overwriting existing sub-sets - // and losing pins. The fix (a few lines down from this comment), is to - // map the hash value down to the 8 bit keyspace here while creating the - // buckets. This way, we avoid any overlapping later on. - k, ok := iter() - if !ok { - break - } - h := hash(depth, k) % defaultFanout - hashed[h] = append(hashed[h], k) - } - - for h, items := range hashed { - if len(items) == 0 { - // recursion base case - continue - } - - childIter := getCidListIterator(items) - - // recursively create a pinset from the items for this bucket index - child, err := storeItems(ctx, dag, uint64(len(items)), depth+1, childIter, internalKeys) - if err != nil { - return nil, err - } - - size, err := child.Size() - if err != nil { - return nil, err - } - - err = dag.Add(ctx, child) - if err != nil { - return nil, err - } - childKey := child.Cid() - - internalKeys(childKey) - - // overwrite the 'empty key' in the existing links array - n.Links()[h] = &ipld.Link{ - Cid: childKey, - Size: size, - } - } - return n, nil -} - -func readHdr(n *merkledag.ProtoNode) (*pb.Set, error) { - hdrLenRaw, consumed := binary.Uvarint(n.Data()) - if consumed <= 0 { - return nil, errors.New("invalid Set header length") - } - - pbdata := n.Data()[consumed:] - if hdrLenRaw > uint64(len(pbdata)) { - return nil, errors.New("impossibly large Set header length") - } - // as hdrLenRaw was <= an int, we now know it fits in an int - hdrLen := int(hdrLenRaw) - var hdr pb.Set - if err := proto.Unmarshal(pbdata[:hdrLen], &hdr); err != nil { - return nil, err - } - - if v := hdr.GetVersion(); v != 1 { - return nil, fmt.Errorf("unsupported Set version: %d", v) - } - if uint64(hdr.GetFanout()) > uint64(len(n.Links())) { - return nil, errors.New("impossibly large Fanout") - } - return &hdr, nil -} - -func writeHdr(n *merkledag.ProtoNode, hdr *pb.Set) error { - hdrData, err := proto.Marshal(hdr) - if err != nil { - return err - } - - // make enough space for the length prefix and the marshaled header data - data := make([]byte, binary.MaxVarintLen64, binary.MaxVarintLen64+len(hdrData)) - - // write the uvarint length of the header data - uvarlen := binary.PutUvarint(data, uint64(len(hdrData))) - - // append the actual protobuf data *after* the length value we wrote - data = append(data[:uvarlen], hdrData...) - - n.SetData(data) - return nil -} - -type walkerFunc func(idx int, link *ipld.Link) error - -func walkItems(ctx context.Context, dag ipld.DAGService, n *merkledag.ProtoNode, fn walkerFunc, children keyObserver) error { - hdr, err := readHdr(n) - if err != nil { - return err - } - // readHdr guarantees fanout is a safe value - fanout := hdr.GetFanout() - for i, l := range n.Links()[fanout:] { - if err := fn(i, l); err != nil { - return err - } - } - for _, l := range n.Links()[:fanout] { - c := l.Cid - children(c) - if c.Equals(emptyKey) { - continue - } - subtree, err := l.GetNode(ctx, dag) - if err != nil { - return err - } - - stpb, ok := subtree.(*merkledag.ProtoNode) - if !ok { - return merkledag.ErrNotProtobuf - } - - if err := walkItems(ctx, dag, stpb, fn, children); err != nil { - return err - } - } - return nil -} - -func loadSet(ctx context.Context, dag ipld.DAGService, root *merkledag.ProtoNode, name string, internalKeys keyObserver) ([]cid.Cid, error) { - l, err := root.GetNodeLink(name) - if err != nil { - return nil, err - } - - lnkc := l.Cid - internalKeys(lnkc) - - n, err := l.GetNode(ctx, dag) - if err != nil { - return nil, err - } - - pbn, ok := n.(*merkledag.ProtoNode) - if !ok { - return nil, merkledag.ErrNotProtobuf - } - - var res []cid.Cid - walk := func(idx int, link *ipld.Link) error { - res = append(res, link.Cid) - return nil - } - - if err := walkItems(ctx, dag, pbn, walk, internalKeys); err != nil { - return nil, err - } - return res, nil -} - -func getCidListIterator(cids []cid.Cid) itemIterator { - return func() (c cid.Cid, ok bool) { - if len(cids) == 0 { - return cid.Cid{}, false - } - - first := cids[0] - cids = cids[1:] - return first, true - } -} - -func storeSet(ctx context.Context, dag ipld.DAGService, cids []cid.Cid, internalKeys keyObserver) (*merkledag.ProtoNode, error) { - iter := getCidListIterator(cids) - - n, err := storeItems(ctx, dag, uint64(len(cids)), 0, iter, internalKeys) - if err != nil { - return nil, err - } - err = dag.Add(ctx, n) - if err != nil { - return nil, err - } - internalKeys(n.Cid()) - return n, nil -} diff --git a/pin/set_test.go b/pin/set_test.go deleted file mode 100644 index d9a573c5fa2..00000000000 --- a/pin/set_test.go +++ /dev/null @@ -1,101 +0,0 @@ -package pin - -import ( - "context" - "encoding/binary" - "testing" - - bserv "github.com/ipfs/go-blockservice" - dag "github.com/ipfs/go-merkledag" - - cid "github.com/ipfs/go-cid" - ds "github.com/ipfs/go-datastore" - dsq "github.com/ipfs/go-datastore/query" - blockstore "github.com/ipfs/go-ipfs-blockstore" - offline "github.com/ipfs/go-ipfs-exchange-offline" -) - -func ignoreCids(_ cid.Cid) {} - -func objCount(d ds.Datastore) int { - q := dsq.Query{KeysOnly: true} - res, err := d.Query(q) - if err != nil { - panic(err) - } - - var count int - for { - _, ok := res.NextSync() - if !ok { - break - } - - count++ - } - return count -} - -func TestSet(t *testing.T) { - dst := ds.NewMapDatastore() - bstore := blockstore.NewBlockstore(dst) - ds := dag.NewDAGService(bserv.New(bstore, offline.Exchange(bstore))) - - // this value triggers the creation of a recursive shard. - // If the recursive sharding is done improperly, this will result in - // an infinite recursion and crash (OOM) - limit := uint32((defaultFanout * maxItems) + 1) - - var inputs []cid.Cid - buf := make([]byte, 4) - for i := uint32(0); i < limit; i++ { - binary.BigEndian.PutUint32(buf, i) - c := dag.NewRawNode(buf).Cid() - inputs = append(inputs, c) - } - - _, err := storeSet(context.Background(), ds, inputs[:len(inputs)-1], ignoreCids) - if err != nil { - t.Fatal(err) - } - - objs1 := objCount(dst) - - out, err := storeSet(context.Background(), ds, inputs, ignoreCids) - if err != nil { - t.Fatal(err) - } - - objs2 := objCount(dst) - if objs2-objs1 > 2 { - t.Fatal("set sharding does not appear to be deterministic") - } - - // weird wrapper node because loadSet expects us to pass an - // object pointing to multiple named sets - setroot := &dag.ProtoNode{} - err = setroot.AddNodeLink("foo", out) - if err != nil { - t.Fatal(err) - } - - outset, err := loadSet(context.Background(), ds, setroot, "foo", ignoreCids) - if err != nil { - t.Fatal(err) - } - - if uint32(len(outset)) != limit { - t.Fatal("got wrong number", len(outset), limit) - } - - seen := cid.NewSet() - for _, c := range outset { - seen.Add(c) - } - - for _, c := range inputs { - if !seen.Has(c) { - t.Fatalf("expected to have '%s', didnt find it", c) - } - } -} diff --git a/provider/simple/reprovide.go b/provider/simple/reprovide.go index ce5c71812fd..cbcaddb3831 100644 --- a/provider/simple/reprovide.go +++ b/provider/simple/reprovide.go @@ -199,16 +199,26 @@ func NewPinnedProvider(onlyRoots bool) func(pin.Pinner, ipld.DAGService) KeyChan func pinSet(ctx context.Context, pinning pin.Pinner, dag ipld.DAGService, onlyRoots bool) (*cidutil.StreamingSet, error) { set := cidutil.NewStreamingSet() + directCids, err := pinning.PinnedCids(false) + if err != nil { + return nil, err + } + + recursiveCids, err := pinning.PinnedCids(true) + if err != nil { + return nil, err + } + go func() { ctx, cancel := context.WithCancel(ctx) defer cancel() defer close(set.New) - for _, key := range pinning.DirectKeys() { + for _, key := range directCids { set.Visitor(ctx)(key) } - for _, key := range pinning.RecursiveKeys() { + for _, key := range recursiveCids { set.Visitor(ctx)(key) if !onlyRoots { diff --git a/test/sharness/t0010-basic-commands.sh b/test/sharness/t0010-basic-commands.sh index d483adfd7c9..4f54a2ec8c7 100755 --- a/test/sharness/t0010-basic-commands.sh +++ b/test/sharness/t0010-basic-commands.sh @@ -45,7 +45,7 @@ test_expect_success "ipfs version deps succeeds" ' ipfs version deps >deps.txt ' -test_expect_success "ipfs version deps output looks good" ' +test_expect_failure "ipfs version deps output looks good" ' head -1 deps.txt | grep "go-ipfs@(devel)" && [[ $(tail -n +2 deps.txt | egrep -v -c "^[^ @]+@v[^ @]+( => [^ @]+@v[^ @]+)?$") -eq 0 ]] || test_fsh cat deps.txt @@ -138,7 +138,7 @@ test_expect_success "'ipfs commands --flags' succeeds" ' ' test_expect_success "'ipfs commands --flags' output looks good" ' - grep "ipfs pin add --recursive / ipfs pin add -r" commands.txt && + grep "ipfs pin add --direct / ipfs pin add -d" commands.txt && grep "ipfs id --format / ipfs id -f" commands.txt && grep "ipfs repo gc --quiet / ipfs repo gc -q" commands.txt ' diff --git a/test/sharness/t0025-datastores.sh b/test/sharness/t0025-datastores.sh index 21100e5ae31..2796c2f69a0 100755 --- a/test/sharness/t0025-datastores.sh +++ b/test/sharness/t0025-datastores.sh @@ -10,7 +10,7 @@ test_expect_success "'ipfs init --profile=badgerds' succeeds" ' ' test_expect_success "'ipfs pin ls' works" ' - ipfs pin ls | wc -l | grep 9 + ipfs pin ls -r | wc -l | grep 8 ' test_done diff --git a/test/sharness/t0040-add-and-cat.sh b/test/sharness/t0040-add-and-cat.sh index 0d7c98f7169..528063df66e 100755 --- a/test/sharness/t0040-add-and-cat.sh +++ b/test/sharness/t0040-add-and-cat.sh @@ -377,7 +377,7 @@ test_add_cat_5MB() { ' test_expect_success "remove hash" ' - ipfs pin rm "$EXP_HASH" && + ipfs pin rm "added/$EXP_HASH" && ipfs block rm "$EXP_HASH" ' @@ -497,7 +497,7 @@ test_add_named_pipe() { err_prefix=$1 test_expect_success "useful error message when adding a named pipe" ' mkfifo named-pipe && - test_expect_code 1 ipfs add named-pipe 2>actual && + test_expect_code 1 ipfs add -P named-pipe named-pipe 2>actual && STAT=$(generic_stat named-pipe) && rm named-pipe && grep "Error: unrecognized file type for named-pipe: $STAT" actual && @@ -509,7 +509,7 @@ test_add_named_pipe() { mkdir -p named-pipe-dir && mkfifo named-pipe-dir/named-pipe && STAT=$(generic_stat named-pipe-dir/named-pipe) && - test_expect_code 1 ipfs add -r named-pipe-dir 2>actual && + test_expect_code 1 ipfs add -P named-pipe -r named-pipe-dir 2>actual && printf "Error:$err_prefix unrecognized file type for named-pipe-dir/named-pipe: $STAT\n" >expected && rm named-pipe-dir/named-pipe && rmdir named-pipe-dir && @@ -796,7 +796,7 @@ test_add_cat_expensive "--cid-version=1" "bafybeidkj5ecbhrqmzrcee2rw7qwsx24z3364 # encoded with the blake2b-256 hash funtion test_add_cat_expensive '--hash=blake2b-256' "bafykbzaceb26fnq5hz5iopzamcb4yqykya5x6a4nvzdmcyuu4rj2akzs3z7r6" -test_add_named_pipe " Post http://$API_ADDR/api/v0/add?chunker=size-262144&encoding=json&hash=sha2-256&inline-limit=32&pin=true&progress=true&recursive=true&stream-channels=true:" +test_add_named_pipe " Post http://$API_ADDR/api/v0/add?chunker=size-262144&encoding=json&hash=sha2-256&inline-limit=32&pin=true&pinpath=named-pipe&progress=true&recursive=true&stream-channels=true:" test_add_pwd_is_symlink diff --git a/test/sharness/t0046-id-hash.sh b/test/sharness/t0046-id-hash.sh index 9954f917d18..b2a019fd910 100755 --- a/test/sharness/t0046-id-hash.sh +++ b/test/sharness/t0046-id-hash.sh @@ -34,7 +34,7 @@ test_expect_success "but can fetch it anyway" ' ' test_expect_success "block rm does nothing" ' - ipfs pin rm $HASH && + ipfs pin rm added/$HASH && ipfs block rm $HASH ' diff --git a/test/sharness/t0050-block.sh b/test/sharness/t0050-block.sh index abc50c109b6..fe5263b69fc 100755 --- a/test/sharness/t0050-block.sh +++ b/test/sharness/t0050-block.sh @@ -96,7 +96,6 @@ test_expect_success "add and pin directory" ' echo "file2" > adir/file2 && echo "file3" > adir/file3 && ipfs add -r adir - ipfs pin add -r $DIRHASH ' test_expect_success "can't remove pinned block" ' @@ -104,7 +103,7 @@ test_expect_success "can't remove pinned block" ' ' test_expect_success "can't remove pinned block: output looks good" ' - grep -q "$DIRHASH: pinned: recursive" block_rm_err + grep -q "$DIRHASH: pinned under added/$DIRHASH recursively" block_rm_err ' test_expect_success "can't remove indirectly pinned block" ' @@ -112,11 +111,11 @@ test_expect_success "can't remove indirectly pinned block" ' ' test_expect_success "can't remove indirectly pinned block: output looks good" ' - grep -q "$FILE1HASH: pinned via $DIRHASH" block_rm_err + grep -q "$FILE1HASH: pinned under added/$DIRHASH via $DIRHASH" block_rm_err ' test_expect_success "remove pin" ' - ipfs pin rm -r $DIRHASH + ipfs pin rm added/$DIRHASH ' test_expect_success "multi-block 'ipfs block rm' succeeds" ' @@ -148,7 +147,7 @@ test_expect_success "'add some blocks' succeeds" ' test_expect_success "add and pin directory" ' ipfs add -r adir - ipfs pin add -r $DIRHASH + ipfs pin add $DIRHASH ' HASH=QmRKqGMAM6EZngbpjSqrvYzq5Qd8b1bSWymjSUY9zQSNDk diff --git a/test/sharness/t0080-repo.sh b/test/sharness/t0080-repo.sh index 2882e8721ca..c381b5f01f7 100755 --- a/test/sharness/t0080-repo.sh +++ b/test/sharness/t0080-repo.sh @@ -21,7 +21,7 @@ test_expect_success "'ipfs add afile' succeeds" ' ' test_expect_success "added file was pinned" ' - ipfs pin ls --type=recursive >actual && + ipfs pin ls -r added/ --type=recursive >actual && grep "$HASH" actual ' @@ -39,11 +39,11 @@ test_expect_success "'ipfs repo gc' doesnt remove file" ' ' test_expect_success "'ipfs pin rm' succeeds" ' - ipfs pin rm -r "$HASH" >actual1 + ipfs pin rm "added/$HASH" >actual1 ' test_expect_success "'ipfs pin rm' output looks good" ' - echo "unpinned $HASH" >expected1 && + echo "unpinned added/$HASH" >expected1 && test_cmp expected1 actual1 ' @@ -53,7 +53,7 @@ test_expect_success "ipfs repo gc fully reverse ipfs add (part 1)" ' expected="$(directory_size "$IPFS_PATH/blocks")" && find "$IPFS_PATH/blocks" -type f && hash=$(ipfs add -q gcfile) && - ipfs pin rm -r $hash && + ipfs pin rm added/$hash && ipfs repo gc ' @@ -68,45 +68,33 @@ test_expect_success "ipfs repo gc fully reverse ipfs add (part 2)" ' test_launch_ipfs_daemon --offline test_expect_success "file no longer pinned" ' - ipfs pin ls --type=recursive --quiet >actual2 && + ipfs pin ls -r --type=recursive --quiet >actual2 && test_expect_code 1 grep $HASH actual2 ' test_expect_success "recursively pin afile(default action)" ' - HASH=`ipfs add -q afile` && + HASH=`ipfs add -q --pin=false afile` && ipfs pin add "$HASH" ' test_expect_success "recursively pin rm afile (default action)" ' - ipfs pin rm "$HASH" + ipfs pin rm "default/$HASH" ' test_expect_success "recursively pin afile" ' - ipfs pin add -r "$HASH" -' - -test_expect_success "pinning directly should fail now" ' - echo "Error: pin: $HASH already pinned recursively" >expected3 && - test_must_fail ipfs pin add -r=false "$HASH" 2>actual3 && - test_cmp expected3 actual3 -' - -test_expect_success "'ipfs pin rm -r=false ' should fail" ' - echo "Error: $HASH is pinned recursively" >expected4 - test_must_fail ipfs pin rm -r=false "$HASH" 2>actual4 && - test_cmp expected4 actual4 + ipfs pin add "$HASH" ' -test_expect_success "remove recursive pin, add direct" ' - echo "unpinned $HASH" >expected5 && - ipfs pin rm -r "$HASH" >actual5 && - test_cmp expected5 actual5 && - ipfs pin add -r=false "$HASH" +test_expect_success "pinning directly should not fail either" ' + ipfs pin add -d "$HASH" ' +test_expect_success "remove recursive pin" ' + echo "unpinned default/$HASH" >expected6 && + ipfs pin rm "default/$HASH" >actual6 && test_expect_success "remove direct pin" ' - echo "unpinned $HASH" >expected6 && - ipfs pin rm "$HASH" >actual6 && + echo "unpinned default/$HASH" >expected6 && + ipfs pin rm -d "default/$HASH" >actual6 && test_cmp expected6 actual6 ' @@ -130,37 +118,38 @@ test_expect_success "adding multiblock random file succeeds" ' ' test_expect_success "'ipfs pin ls --type=indirect' is correct" ' - ipfs refs "$MBLOCKHASH" >refsout && - ipfs refs -r "$HASH_WELCOME_DOCS" >>refsout && - sed -i"~" "s/\(.*\)/\1 indirect/g" refsout && - ipfs pin ls --type=indirect >indirectpins && + ipfs refs "$MBLOCKHASH" >mbrefsout && + ipfs refs -r "$HASH_WELCOME_DOCS" >assetsrefsout && + sed -i"~" "s|\(.*\)|\1 indirect added/$MBLOCKHASH|g" mbrefsout && + sed -i"~" "s/\(.*\)/\1 indirect assets/g" assetsrefsout && + ipfs pin ls -r --type=indirect >indirectpins && + cat assetsrefsout mbrefsout > refsout && test_sort_cmp refsout indirectpins ' test_expect_success "pin something directly" ' echo "ipfs is so awesome" >awesome && DIRECTPIN=`ipfs add -q awesome` && - echo "unpinned $DIRECTPIN" >expected9 && - ipfs pin rm -r "$DIRECTPIN" >actual9 && + echo "unpinned added/$DIRECTPIN" >expected9 && + ipfs pin rm "added/$DIRECTPIN" >actual9 && test_cmp expected9 actual9 && echo "pinned $DIRECTPIN directly" >expected10 && - ipfs pin add -r=false "$DIRECTPIN" >actual10 && + ipfs pin add -d "$DIRECTPIN" >actual10 && test_cmp expected10 actual10 ' test_expect_success "'ipfs pin ls --type=direct' is correct" ' - echo "$DIRECTPIN direct" >directpinexpected && - ipfs pin ls --type=direct >directpinout && + echo "$DIRECTPIN direct default/$DIRECTPIN" >directpinexpected && + ipfs pin ls -r --type=direct >directpinout && test_sort_cmp directpinexpected directpinout ' test_expect_success "'ipfs pin ls --type=recursive' is correct" ' - echo "$MBLOCKHASH" >rp_expected && - echo "$HASH_WELCOME_DOCS" >>rp_expected && - echo "$EMPTY_DIR" >>rp_expected && - sed -i"~" "s/\(.*\)/\1 recursive/g" rp_expected && - ipfs pin ls --type=recursive >rp_actual && + echo "$MBLOCKHASH added/$MBLOCKHASH" >rp_expected && + echo "$HASH_WELCOME_DOCS assets" >>rp_expected && + sed -i"~" -E "s/^([^ ]+)/\1 recursive/g" rp_expected && + ipfs pin ls -r --type=recursive >rp_actual && test_sort_cmp rp_expected rp_actual ' @@ -169,7 +158,7 @@ test_expect_success "'ipfs pin ls --type=all --quiet' is correct" ' cat rp_actual >>allpins && cat indirectpins >>allpins && cut -f1 -d " " allpins | sort | uniq >> allpins_uniq_hashes && - ipfs pin ls --type=all --quiet >actual_allpins && + ipfs pin ls -r --type=all --quiet >actual_allpins && test_sort_cmp allpins_uniq_hashes actual_allpins ' diff --git a/test/sharness/t0081-repo-pinning.sh b/test/sharness/t0081-repo-pinning.sh index 54e64253c04..2610fbb4d35 100755 --- a/test/sharness/t0081-repo-pinning.sh +++ b/test/sharness/t0081-repo-pinning.sh @@ -15,7 +15,7 @@ test_pin_flag() { echo "test_pin_flag" "$@" - if ipfs pin ls --type="$ptype" "$object" >actual + if ipfs pin ls -r --type="$ptype" | grep "^$object" >actual then test "$expect" = "true" && return test_fsh cat actual @@ -141,7 +141,7 @@ test_expect_success "added dir was NOT pinned indirectly" ' ' test_expect_success "nothing is pinned directly" ' - ipfs pin ls --type=direct >actual4 && + ipfs pin ls -r --type=direct >actual4 && test_must_be_empty actual4 ' @@ -166,8 +166,8 @@ test_expect_success "objects are still there" ' ' test_expect_success "remove dir recursive pin succeeds" ' - echo "unpinned $HASH_DIR1" >expected5 && - ipfs pin rm -r "$HASH_DIR1" >actual5 && + echo "unpinned added/$HASH_DIR1" >expected5 && + ipfs pin rm "added/$HASH_DIR1" >actual5 && test_cmp expected5 actual5 ' @@ -178,16 +178,16 @@ test_expect_success "none are pinned any more" ' test_pin "$HASH_FILE3" && test_pin "$HASH_FILE2" && test_pin "$HASH_FILE1" && - test_pin "$HASH_DIR3" && - test_pin "$HASH_DIR4" && - test_pin "$HASH_DIR2" && + test_pin "$HASH_DIR3" && + test_pin "$HASH_DIR4" && + test_pin "$HASH_DIR2" && test_pin "$HASH_DIR1" ' test_expect_success "pin some directly and indirectly" ' - ipfs pin add -r=false "$HASH_DIR1" >actual7 && - ipfs pin add -r=true "$HASH_DIR2" >>actual7 && - ipfs pin add -r=false "$HASH_FILE1" >>actual7 && + ipfs pin add -d "$HASH_DIR1" >actual7 && + ipfs pin add "$HASH_DIR2" >>actual7 && + ipfs pin add -d "$HASH_FILE1" >>actual7 && echo "pinned $HASH_DIR1 directly" >expected7 && echo "pinned $HASH_DIR2 recursively" >>expected7 && echo "pinned $HASH_FILE1 directly" >>expected7 && @@ -195,10 +195,10 @@ test_expect_success "pin some directly and indirectly" ' ' test_expect_success "pin lists look good" ' - test_pin $HASH_DIR1 direct && - test_pin $HASH_DIR2 recursive && - test_pin $HASH_DIR3 && - test_pin $HASH_DIR4 indirect && + test_pin $HASH_DIR1 direct && + test_pin $HASH_DIR2 recursive && + test_pin $HASH_DIR3 && + test_pin $HASH_DIR4 indirect && test_pin $HASH_FILE1 indirect direct && test_pin $HASH_FILE2 indirect && test_pin $HASH_FILE3 && @@ -226,7 +226,7 @@ test_expect_success "some objects are still there" ' ipfs cat "$HASH_FILE1" >>actual8 && ipfs ls "$HASH_DIR4" >>actual8 && ipfs ls "$HASH_DIR2" >>actual8 && - ipfs object links "$HASH_DIR1" >>actual8 && + ipfs object links "$HASH_DIR1" >>actual8 && test_cmp expected8 actual8 ' @@ -238,8 +238,8 @@ test_expect_success "some are no longer there" ' ' test_expect_success "recursive pin fails without objects" ' - ipfs pin rm -r=false "$HASH_DIR1" && - test_must_fail ipfs pin add -r "$HASH_DIR1" 2>err_expected8 && + ipfs pin rm -d "default/$HASH_DIR1" && + test_must_fail ipfs pin add "$HASH_DIR1" 2>err_expected8 && grep "pin: merkledag: not found" err_expected8 || test_fsh cat err_expected8 ' diff --git a/test/sharness/t0085-pins.sh b/test/sharness/t0085-pins.sh index a5893ebaf39..5666130435a 100755 --- a/test/sharness/t0085-pins.sh +++ b/test/sharness/t0085-pins.sh @@ -82,25 +82,25 @@ test_pins() { test_expect_success "test pin ls $BASE_ARGS hash" ' echo $HASH_B | test_must_fail grep /ipfs && # just to be sure - ipfs pin ls $BASE_ARGS $HASH_B > ls_hash_out && - echo "$HASH_B recursive" > ls_hash_exp && + ipfs pin ls $BASE_ARGS default/$HASH_B > ls_hash_out && + echo "$HASH_B recursive default/$HASH_B" > ls_hash_exp && test_cmp ls_hash_exp ls_hash_out ' test_expect_success "unpin those hashes" ' - cat hashes | ipfs pin rm + cat hashes | sed "s|\(.*\)|default/\1|" | ipfs pin rm ' test_expect_success "test pin update" ' - ipfs pin add "$HASH_A" && - ipfs pin ls $BASE_ARGS | tee before_update && + ipfs pin add -P test/updated_pin "$HASH_A" && + ipfs pin ls $BASE_ARGS -r > before_update && test_should_contain "$HASH_A" before_update && test_must_fail grep -q "$HASH_B" before_update && - ipfs pin update --unpin=true "$HASH_A" "$HASH_B" && - ipfs pin ls $BASE_ARGS > after_update && + ipfs pin update test/updated_pin "$HASH_B" && + ipfs pin ls $BASE_ARGS -r > after_update && test_must_fail grep -q "$HASH_A" after_update && test_should_contain "$HASH_B" after_update && - ipfs pin rm "$HASH_B" + ipfs pin rm test/updated_pin ' } @@ -128,11 +128,11 @@ test_pin_dag() { test_pin_dag_init $1 test_expect_success "'ipfs pin add --progress' file" ' - ipfs pin add --recursive=true $HASH + ipfs pin add $HASH ' test_expect_success "'ipfs pin rm' file" ' - ipfs pin rm $HASH + ipfs pin rm default/$HASH ' test_expect_success "remove part of the dag" ' @@ -141,7 +141,7 @@ test_pin_dag() { ' test_expect_success "pin file, should fail" ' - test_must_fail ipfs pin add --recursive=true $HASH 2> err && + test_must_fail ipfs pin add $HASH 2> err && cat err && grep -q "not found" err ' diff --git a/test/sharness/t0087-repo-robust-gc.sh b/test/sharness/t0087-repo-robust-gc.sh index 9038e9c5b00..dac05ab6b39 100755 --- a/test/sharness/t0087-repo-robust-gc.sh +++ b/test/sharness/t0087-repo-robust-gc.sh @@ -13,7 +13,7 @@ test_gc_robust_part1() { test_expect_success "add a 1MB file with --raw-leaves" ' random 1048576 56 > afile && - HASH1=`ipfs add --raw-leaves -q afile` + HASH1=`ipfs add --raw-leaves -q -P test/afile afile` ' HASH1FILE=.ipfs/blocks/L3/CIQNIPL4GP62ZMNNSLZ2G33Z3T5VAN3YHCJTGT5FG45XWH5FGZRXL3A.data @@ -56,7 +56,7 @@ test_gc_robust_part1() { ' test_expect_success "unpin the 1MB file" ' - ipfs pin rm $HASH1 + ipfs pin rm test/afile ' # make sure the permission problem is fixed on exit, otherwise cleanup @@ -91,7 +91,7 @@ test_gc_robust_part2() { test_expect_success "add 1MB file normally (i.e., without raw leaves)" ' random 1048576 56 > afile && - HASH2=`ipfs add -q afile` + HASH2=`ipfs add -q -P test/afile afile` ' LEAF1=QmSijovevteoY63Uj1uC5b8pkpDU5Jgyk2dYBqz3sMJUPc @@ -142,7 +142,7 @@ test_gc_robust_part2() { ' test_expect_success "unpin 1MB file" ' - ipfs pin rm $HASH2 + ipfs pin rm test/afile ' test_expect_success "'ipfs repo gc' should be fine now" ' diff --git a/test/sharness/t0250-files-api.sh b/test/sharness/t0250-files-api.sh index d26b89042a6..a959b133a66 100755 --- a/test/sharness/t0250-files-api.sh +++ b/test/sharness/t0250-files-api.sh @@ -92,7 +92,7 @@ test_sharding() { test_expect_success "can unpin a file from sharded directory $EXTRA" ' read -r _ HASH _ < pin_hash && - ipfs pin rm $HASH + ipfs pin rm default/$HASH ' test_expect_success "output object was really sharded and has correct hash $EXTRA" ' diff --git a/test/sharness/t0252-files-gc.sh b/test/sharness/t0252-files-gc.sh index 3666d7a481f..7dc67fbe920 100755 --- a/test/sharness/t0252-files-gc.sh +++ b/test/sharness/t0252-files-gc.sh @@ -29,12 +29,12 @@ test_expect_success "gc okay after adding incomplete node -- prep" ' ipfs files mkdir /adir && echo "file1" | ipfs files write --create /adir/file1 && echo "file2" | ipfs files write --create /adir/file2 && - ipfs pin add --recursive=false $ADIR_HASH && + ipfs pin add -d $ADIR_HASH && ipfs files rm -r /adir && ipfs repo gc && # will remove /adir/file1 and /adir/file2 but not /adir test_must_fail ipfs cat $FILE1_HASH && ipfs files cp /ipfs/$ADIR_HASH /adir && - ipfs pin rm $ADIR_HASH + ipfs pin rm -d default/$ADIR_HASH ' test_expect_success "gc okay after adding incomplete node" ' @@ -49,7 +49,7 @@ test_expect_success "add directory with direct pin" ' FILE_UNPINNED=$(ipfs add --pin=false -q -r mydir/hello.txt) && DIR_PINNED=$(ipfs add --pin=false -q -r mydir | tail -n1) && ipfs add --pin=false -r mydir && - ipfs pin add --recursive=false $DIR_PINNED && + ipfs pin add -d $DIR_PINNED && ipfs cat $FILE_UNPINNED ' diff --git a/test/sharness/t0260-sharding.sh b/test/sharness/t0260-sharding.sh index 20be436c7a3..e70658a88d8 100755 --- a/test/sharness/t0260-sharding.sh +++ b/test/sharness/t0260-sharding.sh @@ -69,7 +69,7 @@ test_expect_success "'ipfs ls --resolve-type=false --size=false' admits missing ipfs ls "$SHARDED" | head -1 > first_file && ipfs ls --size=false "$SHARDED" | sort > sharded_out_nosize && read -r HASH _ NAME /dev/null ' @@ -131,7 +131,7 @@ EOF ' test_expect_success "remove broken files" ' - ipfs pin rm $HASH2 && + ipfs pin rm default/$HASH2 && ipfs repo gc > /dev/null ' diff --git a/test/sharness/t0276-cidv0v1.sh b/test/sharness/t0276-cidv0v1.sh index dfc6dce3876..8f26d19ebdf 100755 --- a/test/sharness/t0276-cidv0v1.sh +++ b/test/sharness/t0276-cidv0v1.sh @@ -59,7 +59,7 @@ test_expect_success "make sure the CIDv1 hash is not in the repo" ' ' test_expect_success "clean up" ' - ipfs pin rm $AHASHv0 && + ipfs pin rm added/$AHASHv0 && ipfs repo gc && ! ipfs refs local | grep -q $AHASHv0 ' diff --git a/test/sharness/t0600-issues-and-regressions-online.sh b/test/sharness/t0600-issues-and-regressions-online.sh index 1abf87170d9..51f51e925f3 100755 --- a/test/sharness/t0600-issues-and-regressions-online.sh +++ b/test/sharness/t0600-issues-and-regressions-online.sh @@ -35,14 +35,14 @@ test_expect_success "metrics work" ' test_expect_success "pin add api looks right - #3753" ' HASH=$(echo "foo" | ipfs add -q) && - curl "http://$API_ADDR/api/v0/pin/add/$HASH" > pinadd_out && + curl "http://$API_ADDR/api/v0/pin/add/$HASH?pinpath=pintest" > pinadd_out && echo "{\"Pins\":[\"QmYNmQKp6SuaVrpgWRsPTgCQCnpxUYGq76YEKBXuj2N4H6\"]}" > pinadd_exp && test_cmp pinadd_out pinadd_exp ' test_expect_success "pin add api looks right - #3753" ' - curl "http://$API_ADDR/api/v0/pin/rm/$HASH" > pinrm_out && - echo "{\"Pins\":[\"QmYNmQKp6SuaVrpgWRsPTgCQCnpxUYGq76YEKBXuj2N4H6\"]}" > pinrm_exp && + curl "http://$API_ADDR/api/v0/pin/rm/pintest" > pinrm_out && + echo "{\"Pins\":[\"pintest\"]}" > pinrm_exp && test_cmp pinrm_out pinrm_exp ' diff --git a/test/sharness/x0601-pin-fail-test.sh b/test/sharness/x0601-pin-fail-test.sh index ffab1062d07..301bc225f8d 100755 --- a/test/sharness/x0601-pin-fail-test.sh +++ b/test/sharness/x0601-pin-fail-test.sh @@ -14,7 +14,7 @@ test_launch_ipfs_daemon test_expect_success "pre-test setup" ' printf "" > pins && - ipfs pin ls --type=recursive -q > rec_pins_before + ipfs pin ls -r --type=recursive -q > rec_pins_before ' @@ -26,7 +26,7 @@ do done test_expect_success "get pinset afterwards" ' - ipfs pin ls --type=recursive -q | sort > rec_pins_after && + ipfs pin ls -r --type=recursive -q | sort > rec_pins_after && cat pins rec_pins_before | sort | uniq > exp_pins_after && test_cmp rec_pins_after exp_pins_after '