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

Fix rebase failures

Browse Source
This commit is contained in:
Abhishek Pandey 2024-01-26 14:42:55 -08:00
parent 5230e60b24
commit 9f68f379e7
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/internal/m365/collection/groups/collection.go
View File

@ -391,18 +391,22 @@ func (col *lazyFetchCollection[C, I]) streamItems(ctx context.Context, errs *fau
// //
// If the data download fails for some reason other than deleted in // If the data download fails for some reason other than deleted in
// flight, we will still end up persisting a .meta file. This is // flight, we will still end up persisting a .meta file. This is
// fine however, since the next backup will overwrite it. // fine since the next backup will overwrite it.
// //
// If item is deleted in flight, we will end up with an orphaned // If item is deleted in flight, we will end up with an orphaned
// .meta file. The only impact here is storage bloat, which // .meta file. The only impact here is storage bloat, which
// is minimal. Other impact could be if we do an in-order restore // is minimal. Other impact could be if we do an in-order restore
// using a tree built from .meta files. We may have some .meta // using a tree built from .meta files. We may have some .meta
// files without corresponding .data files. // files without corresponding .data files.
itemMeta, _, err := col.getAndAugment.getItemMetadata( if col.getAndAugment.supportsItemMetadata() {
ictx, dataFile += metadata.DataFileSuffix
col.contains.container) metaFile := id + metadata.MetaFileSuffix
if err != nil && !errors.Is(err, errMetadataFilesNotSupported) {
errs.AddRecoverable(ctx, clues.StackWC(ctx, err)) itemMeta, _, err := col.getAndAugment.getItemMetadata(
ictx,
col.contains.container)
if err != nil {
errs.AddRecoverable(ctx, clues.StackWC(ctx, err))
return return
} }