larryh/corso
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor fixes from code review

Browse Source
This commit is contained in:
ryanfkeepers 2022-12-21 16:41:22 -07:00
parent 591b13388d
commit 2acf01af31
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/internal/connector/exchange/service_iterators.go
View File

@ -49,7 +49,7 @@ func filterContainersAndFillCollections(
deltaURLs = map[string]string{} deltaURLs = map[string]string{}
currPaths = map[string]string{} currPaths = map[string]string{}
// copy of previousPaths. any folder found in the resolver get // copy of previousPaths. any folder found in the resolver get
// deleted from this map, leaving only the deleted maps behind // deleted from this map, leaving only the deleted folders behind
tombstones = makeTombstones(dps) tombstones = makeTombstones(dps)
) )
@ -100,10 +100,12 @@ func filterContainersAndFillCollections(
jobs, newDelta, err := getJobs(ctx, service, qp.ResourceOwner, cID, prevDelta) jobs, newDelta, err := getJobs(ctx, service, qp.ResourceOwner, cID, prevDelta)
if err != nil { if err != nil {
// race conditions happen, containers might get deleted while // race conditions happen, containers might get deleted while
// this process is in flight. If it was deleted, we skip it // this process is in flight. If it was deleted, we remake the
// and move on, which will create a tombstone to delete the path. // tombstone, just to be sure it gets deleted from storage.
if graph.IsErrDeletedInFlight(err) == nil { if graph.IsErrDeletedInFlight(err) == nil {
errs = support.WrapAndAppend(qp.ResourceOwner, err, errs) errs = support.WrapAndAppend(qp.ResourceOwner, err, errs)
} else {
tombstones[currPath.String()] = struct{}{}
} }
continue continue