mirror/kopia
1
0
Fork 0
mirror of https://github.com/kopia/kopia.git synced 2026-03-27 18:42:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Generalize enqueue filtering in TreeWalker

Browse Source
This commit is contained in:
Julio Lopez
2019-11-05 21:43:10 -08:00
committed by Jarek Kowalski
parent 91508dac46
commit 78e05ffe5e
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
snapshot/gc/gc.go
View File

@@ -8,6 +8,7 @@
"github.com/pkg/errors"
"github.com/kopia/kopia/fs"
"github.com/kopia/kopia/internal/kopialogging"
"github.com/kopia/kopia/internal/units"
"github.com/kopia/kopia/repo"
@@ -20,9 +21,11 @@
var log = kopialogging.Logger("kopia/snapshot/gc")
func findInUseContentIDs(ctx context.Context, rep *repo.Repository, used *sync.Map) error {
w := snapshotfs.NewTreeWalker()
func oidOf(entry fs.Entry) object.ID {
return entry.(object.HasObjectID).ObjectID()
}
func findInUseContentIDs(ctx context.Context, rep *repo.Repository, used *sync.Map) error {
ids, err := snapshot.ListSnapshotManifests(ctx, rep, nil)
if err != nil {
return errors.Wrap(err, "unable to list snapshot manifest IDs")
@@ -33,6 +36,8 @@ func findInUseContentIDs(ctx context.Context, rep *repo.Repository, used *sync.M
return errors.Wrap(err, "unable to load manifest IDs")
}
w := snapshotfs.NewTreeWalker()
w.EntryID = func(e fs.Entry) interface{} { return oidOf(e) }
for _, m := range manifests {
root, err := snapshotfs.SnapshotRoot(rep, m)
if err != nil {

10
snapshot/snapshotfs/snapshot_tree_walker.go
View File

@@ -12,10 +12,15 @@
"github.com/kopia/kopia/repo/object"
)
// TreeWalker holds information for concurrently walking down FS trees specified
// by their roots
type TreeWalker struct {
Parallelism int
RootEntries []fs.Entry
ObjectCallback func(oid object.ID) error
// EntryID extracts or generates an id from an fs.Entry.
// It can be used to eliminate duplicate entries when in a FS
EntryID func(entry fs.Entry) interface{}
enqueued sync.Map
queue *parallelwork.Queue
@@ -26,8 +31,8 @@ func oidOf(entry fs.Entry) object.ID {
}
func (w *TreeWalker) enqueueEntry(ctx context.Context, entry fs.Entry) {
oid := oidOf(entry)
if _, existing := w.enqueued.LoadOrStore(oid, w); existing {
eid := w.EntryID(entry)
if _, existing := w.enqueued.LoadOrStore(eid, w); existing {
return
}
@@ -54,6 +59,7 @@ func (w *TreeWalker) processEntry(ctx context.Context, entry fs.Entry) error {
return nil
}
// Run walks the given tree roots
func (w *TreeWalker) Run(ctx context.Context) error {
for _, root := range w.RootEntries {
w.enqueueEntry(ctx, root)