forked from TrueCloudLab/restic
find: Add support for blobs, IDs and packs lookups
With --blob, --tree and --pack, the find command now lists the snapshots that contain a specific tree or blob, or the snapshots that contain blobs belonging to a given pack. It also displays the pack ID a blob belongs to. A list of IDs can be given, as long as the IDs are all of the same type.
This commit is contained in:
parent
d708d607fa
commit
bb5425a1d8
1 changed files with 247 additions and 16 deletions
|
@ -17,26 +17,31 @@ import (
|
||||||
|
|
||||||
var cmdFind = &cobra.Command{
|
var cmdFind = &cobra.Command{
|
||||||
Use: "find [flags] PATTERN",
|
Use: "find [flags] PATTERN",
|
||||||
Short: "Find a file or directory",
|
Short: "Find a file, a directory or restic IDs",
|
||||||
Long: `
|
Long: `
|
||||||
The "find" command searches for files or directories in snapshots stored in the
|
The "find" command searches for files or directories in snapshots stored in the
|
||||||
repo. `,
|
repo.
|
||||||
|
It can also be used to search for restic blobs or trees for troubleshooting.`,
|
||||||
DisableAutoGenTag: true,
|
DisableAutoGenTag: true,
|
||||||
RunE: func(cmd *cobra.Command, args []string) error {
|
RunE: func(cmd *cobra.Command, args []string) error {
|
||||||
return runFind(findOptions, globalOptions, args)
|
return runFind(findOptions, globalOptions, args)
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const shortStr = 8 // Length of short IDs: 4 bytes as hex strings
|
||||||
|
|
||||||
// FindOptions bundles all options for the find command.
|
// FindOptions bundles all options for the find command.
|
||||||
type FindOptions struct {
|
type FindOptions struct {
|
||||||
Oldest string
|
Oldest string
|
||||||
Newest string
|
Newest string
|
||||||
Snapshots []string
|
Snapshots []string
|
||||||
CaseInsensitive bool
|
BlobID, TreeID bool
|
||||||
ListLong bool
|
PackID, ShowPackID bool
|
||||||
Host string
|
CaseInsensitive bool
|
||||||
Paths []string
|
ListLong bool
|
||||||
Tags restic.TagLists
|
Host string
|
||||||
|
Paths []string
|
||||||
|
Tags restic.TagLists
|
||||||
}
|
}
|
||||||
|
|
||||||
var findOptions FindOptions
|
var findOptions FindOptions
|
||||||
|
@ -48,6 +53,10 @@ func init() {
|
||||||
f.StringVarP(&findOptions.Oldest, "oldest", "O", "", "oldest modification date/time")
|
f.StringVarP(&findOptions.Oldest, "oldest", "O", "", "oldest modification date/time")
|
||||||
f.StringVarP(&findOptions.Newest, "newest", "N", "", "newest modification date/time")
|
f.StringVarP(&findOptions.Newest, "newest", "N", "", "newest modification date/time")
|
||||||
f.StringArrayVarP(&findOptions.Snapshots, "snapshot", "s", nil, "snapshot `id` to search in (can be given multiple times)")
|
f.StringArrayVarP(&findOptions.Snapshots, "snapshot", "s", nil, "snapshot `id` to search in (can be given multiple times)")
|
||||||
|
f.BoolVar(&findOptions.BlobID, "blob", false, "pattern is a blob-ID")
|
||||||
|
f.BoolVar(&findOptions.TreeID, "tree", false, "pattern is a tree-ID")
|
||||||
|
f.BoolVar(&findOptions.PackID, "pack", false, "pattern is a pack-ID")
|
||||||
|
f.BoolVar(&findOptions.ShowPackID, "show-pack-id", false, "display the pack-ID the blobs belong to (with --blob)")
|
||||||
f.BoolVarP(&findOptions.CaseInsensitive, "ignore-case", "i", false, "ignore case for pattern")
|
f.BoolVarP(&findOptions.CaseInsensitive, "ignore-case", "i", false, "ignore case for pattern")
|
||||||
f.BoolVarP(&findOptions.ListLong, "long", "l", false, "use a long listing format showing size and mode")
|
f.BoolVarP(&findOptions.ListLong, "long", "l", false, "use a long listing format showing size and mode")
|
||||||
|
|
||||||
|
@ -95,7 +104,7 @@ type statefulOutput struct {
|
||||||
hits int
|
hits int
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *statefulOutput) PrintJSON(path string, node *restic.Node) {
|
func (s *statefulOutput) PrintPatternJSON(path string, node *restic.Node) {
|
||||||
type findNode restic.Node
|
type findNode restic.Node
|
||||||
b, err := json.Marshal(struct {
|
b, err := json.Marshal(struct {
|
||||||
// Add these attributes
|
// Add these attributes
|
||||||
|
@ -139,7 +148,7 @@ func (s *statefulOutput) PrintJSON(path string, node *restic.Node) {
|
||||||
s.hits++
|
s.hits++
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *statefulOutput) PrintNormal(path string, node *restic.Node) {
|
func (s *statefulOutput) PrintPatternNormal(path string, node *restic.Node) {
|
||||||
if s.newsn != s.oldsn {
|
if s.newsn != s.oldsn {
|
||||||
if s.oldsn != nil {
|
if s.oldsn != nil {
|
||||||
Verbosef("\n")
|
Verbosef("\n")
|
||||||
|
@ -150,11 +159,59 @@ func (s *statefulOutput) PrintNormal(path string, node *restic.Node) {
|
||||||
Printf(formatNode(path, node, s.ListLong) + "\n")
|
Printf(formatNode(path, node, s.ListLong) + "\n")
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *statefulOutput) Print(path string, node *restic.Node) {
|
func (s *statefulOutput) PrintPattern(path string, node *restic.Node) {
|
||||||
if s.JSON {
|
if s.JSON {
|
||||||
s.PrintJSON(path, node)
|
s.PrintPatternJSON(path, node)
|
||||||
} else {
|
} else {
|
||||||
s.PrintNormal(path, node)
|
s.PrintPatternNormal(path, node)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *statefulOutput) PrintObjectJSON(kind, id, nodepath string, sn *restic.Snapshot) {
|
||||||
|
b, err := json.Marshal(struct {
|
||||||
|
// Add these attributes
|
||||||
|
ObjectType string `json:"object_type"`
|
||||||
|
ID string `json:"id"`
|
||||||
|
Path string `json:"path,omitempty"`
|
||||||
|
SnapshotID string `json:"snapshot"`
|
||||||
|
Time time.Time `json:"time,omitempty"`
|
||||||
|
}{
|
||||||
|
ObjectType: kind,
|
||||||
|
ID: id,
|
||||||
|
Path: nodepath,
|
||||||
|
SnapshotID: sn.ID().String(),
|
||||||
|
Time: sn.Time,
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
Warnf("Marshall failed: %v\n", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if !s.inuse {
|
||||||
|
Printf("[")
|
||||||
|
s.inuse = true
|
||||||
|
}
|
||||||
|
if s.hits > 0 {
|
||||||
|
Printf(",")
|
||||||
|
}
|
||||||
|
Printf(string(b))
|
||||||
|
s.hits++
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *statefulOutput) PrintObjectNormal(kind, id, nodepath string, sn *restic.Snapshot) {
|
||||||
|
f := "path"
|
||||||
|
if kind == "blob" {
|
||||||
|
f = "in file"
|
||||||
|
}
|
||||||
|
Printf("Found %s %s\n", kind, id)
|
||||||
|
Printf(" ... %s %s\n", f, nodepath)
|
||||||
|
Printf(" ... in snapshot %s (%s)\n", sn.ID().Str(), sn.Time.Format(TimeFormat))
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *statefulOutput) PrintObject(kind, id, nodepath string, sn *restic.Snapshot) {
|
||||||
|
if s.JSON {
|
||||||
|
s.PrintObjectJSON(kind, id, nodepath, sn)
|
||||||
|
} else {
|
||||||
|
s.PrintObjectNormal(kind, id, nodepath, sn)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -179,6 +236,9 @@ type Finder struct {
|
||||||
pat findPattern
|
pat findPattern
|
||||||
out statefulOutput
|
out statefulOutput
|
||||||
ignoreTrees restic.IDSet
|
ignoreTrees restic.IDSet
|
||||||
|
blobIDs map[string]struct{}
|
||||||
|
treeIDs map[string]struct{}
|
||||||
|
itemsFound int
|
||||||
}
|
}
|
||||||
|
|
||||||
func (f *Finder) findInSnapshot(ctx context.Context, sn *restic.Snapshot) error {
|
func (f *Finder) findInSnapshot(ctx context.Context, sn *restic.Snapshot) error {
|
||||||
|
@ -241,11 +301,148 @@ func (f *Finder) findInSnapshot(ctx context.Context, sn *restic.Snapshot) error
|
||||||
}
|
}
|
||||||
|
|
||||||
debug.Log(" found match\n")
|
debug.Log(" found match\n")
|
||||||
f.out.Print(nodepath, node)
|
f.out.PrintPattern(nodepath, node)
|
||||||
return false, nil
|
return false, nil
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (f *Finder) findIDs(ctx context.Context, sn *restic.Snapshot) error {
|
||||||
|
debug.Log("searching IDs in snapshot %s", sn.ID())
|
||||||
|
|
||||||
|
if sn.Tree == nil {
|
||||||
|
return errors.Errorf("snapshot %v has no tree", sn.ID().Str())
|
||||||
|
}
|
||||||
|
|
||||||
|
f.out.newsn = sn
|
||||||
|
return walker.Walk(ctx, f.repo, *sn.Tree, f.ignoreTrees, func(nodepath string, node *restic.Node, err error) (bool, error) {
|
||||||
|
if err != nil {
|
||||||
|
return false, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if node == nil {
|
||||||
|
return false, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
if node.Type == "dir" && f.treeIDs != nil {
|
||||||
|
treeID := node.Subtree
|
||||||
|
found := false
|
||||||
|
if _, ok := f.treeIDs[treeID.Str()]; ok {
|
||||||
|
found = true
|
||||||
|
} else if _, ok := f.treeIDs[treeID.String()]; ok {
|
||||||
|
found = true
|
||||||
|
}
|
||||||
|
if found {
|
||||||
|
f.out.PrintObject("tree", treeID.String(), nodepath, sn)
|
||||||
|
f.itemsFound++
|
||||||
|
// Terminate if we have found all trees (and we are not
|
||||||
|
// looking for blobs)
|
||||||
|
if f.itemsFound >= len(f.treeIDs) && f.blobIDs == nil {
|
||||||
|
// Return an error to terminate the Walk
|
||||||
|
return true, errors.New("OK")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if node.Type == "file" && f.blobIDs != nil {
|
||||||
|
for _, id := range node.Content {
|
||||||
|
idStr := id.String()
|
||||||
|
if _, ok := f.blobIDs[idStr]; !ok {
|
||||||
|
// Look for short ID form
|
||||||
|
if _, ok := f.blobIDs[idStr[:shortStr]]; !ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
// Replace the short ID with the long one
|
||||||
|
f.blobIDs[idStr] = struct{}{}
|
||||||
|
delete(f.blobIDs, idStr[:shortStr])
|
||||||
|
}
|
||||||
|
f.out.PrintObject("blob", idStr, nodepath, sn)
|
||||||
|
// TODO Printf(" (tree %s)\n", treeID.Str())
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false, nil
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// packsToBlobs converts the list of pack IDs to a list of blob IDs that
|
||||||
|
// belong to those packs.
|
||||||
|
func (f *Finder) packsToBlobs(ctx context.Context, packs []string) error {
|
||||||
|
packIDs := make(map[string]struct{})
|
||||||
|
for _, p := range packs {
|
||||||
|
packIDs[p] = struct{}{}
|
||||||
|
}
|
||||||
|
if f.blobIDs == nil {
|
||||||
|
f.blobIDs = make(map[string]struct{})
|
||||||
|
}
|
||||||
|
|
||||||
|
allPacksFound := false
|
||||||
|
packsFound := 0
|
||||||
|
|
||||||
|
debug.Log("Looking for packs...")
|
||||||
|
err := f.repo.List(ctx, restic.DataFile, func(id restic.ID, size int64) error {
|
||||||
|
if allPacksFound {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
idStr := id.String()
|
||||||
|
if _, ok := packIDs[idStr]; !ok {
|
||||||
|
// Look for short ID form
|
||||||
|
if _, ok := packIDs[idStr[:shortStr]]; !ok {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
debug.Log("Found pack %s", idStr)
|
||||||
|
blobs, _, err := f.repo.ListPack(ctx, id, size)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
for _, b := range blobs {
|
||||||
|
f.blobIDs[b.ID.String()] = struct{}{}
|
||||||
|
}
|
||||||
|
// Stop searching when all packs have been found
|
||||||
|
packsFound++
|
||||||
|
if packsFound >= len(packIDs) {
|
||||||
|
allPacksFound = true
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
})
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if !allPacksFound {
|
||||||
|
return errors.Fatal("unable to find all specified pack(s)")
|
||||||
|
}
|
||||||
|
|
||||||
|
debug.Log("%d blobs found", len(f.blobIDs))
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (f *Finder) findBlobsPacks(ctx context.Context) {
|
||||||
|
idx := f.repo.Index()
|
||||||
|
for i := range f.blobIDs {
|
||||||
|
rid, err := restic.ParseID(i)
|
||||||
|
if err != nil {
|
||||||
|
Printf("Note: cannot find pack for blob '%s', unable to parse ID: %v\n", i, err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
blobs, found := idx.Lookup(rid, restic.DataBlob)
|
||||||
|
if !found {
|
||||||
|
Printf("Blob %s not found in the index\n", rid.Str())
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, b := range blobs {
|
||||||
|
if b.ID.Equal(rid) {
|
||||||
|
Printf("Blob belongs to pack %s\n ... Pack %s: %s\n", b.PackID, b.PackID.Str(), b.String())
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func runFind(opts FindOptions, gopts GlobalOptions, args []string) error {
|
func runFind(opts FindOptions, gopts GlobalOptions, args []string) error {
|
||||||
if len(args) != 1 {
|
if len(args) != 1 {
|
||||||
return errors.Fatal("wrong number of arguments")
|
return errors.Fatal("wrong number of arguments")
|
||||||
|
@ -270,6 +467,14 @@ func runFind(opts FindOptions, gopts GlobalOptions, args []string) error {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Check at most only one kind of IDs is provided: currently we
|
||||||
|
// can't mix types
|
||||||
|
if (opts.BlobID && opts.TreeID) ||
|
||||||
|
(opts.BlobID && opts.PackID) ||
|
||||||
|
(opts.TreeID && opts.PackID) {
|
||||||
|
return errors.Fatal("cannot have several ID types")
|
||||||
|
}
|
||||||
|
|
||||||
repo, err := OpenRepository(gopts)
|
repo, err := OpenRepository(gopts)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
@ -296,12 +501,38 @@ func runFind(opts FindOptions, gopts GlobalOptions, args []string) error {
|
||||||
out: statefulOutput{ListLong: opts.ListLong, JSON: globalOptions.JSON},
|
out: statefulOutput{ListLong: opts.ListLong, JSON: globalOptions.JSON},
|
||||||
ignoreTrees: restic.NewIDSet(),
|
ignoreTrees: restic.NewIDSet(),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if opts.BlobID {
|
||||||
|
f.blobIDs = make(map[string]struct{})
|
||||||
|
// for _, i := range pat {} // TODO: support multiple args
|
||||||
|
f.blobIDs[f.pat.pattern] = struct{}{}
|
||||||
|
}
|
||||||
|
if opts.TreeID {
|
||||||
|
f.treeIDs = make(map[string]struct{})
|
||||||
|
// for _, i := range pat {} // TODO: support multiple args
|
||||||
|
f.treeIDs[f.pat.pattern] = struct{}{}
|
||||||
|
}
|
||||||
|
|
||||||
|
if opts.PackID {
|
||||||
|
f.packsToBlobs(ctx, []string{f.pat.pattern}) // TODO: support multiple packs
|
||||||
|
}
|
||||||
|
|
||||||
for sn := range FindFilteredSnapshots(ctx, repo, opts.Host, opts.Tags, opts.Paths, opts.Snapshots) {
|
for sn := range FindFilteredSnapshots(ctx, repo, opts.Host, opts.Tags, opts.Paths, opts.Snapshots) {
|
||||||
|
if f.blobIDs != nil || f.treeIDs != nil {
|
||||||
|
if err = f.findIDs(ctx, sn); err != nil && err.Error() != "OK" {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
continue
|
||||||
|
}
|
||||||
if err = f.findInSnapshot(ctx, sn); err != nil {
|
if err = f.findInSnapshot(ctx, sn); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
f.out.Finish()
|
f.out.Finish()
|
||||||
|
|
||||||
|
if opts.ShowPackID && f.blobIDs != nil {
|
||||||
|
f.findBlobsPacks(ctx)
|
||||||
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue