Skip to content

Commit

Permalink
Merge #119625
Browse files Browse the repository at this point in the history
119625: backup,restore: fix missing Close() calls r=dt a=dt

Release note (bug fix): fixed a condition where some files were not closed  when inspecting backup metadata during BACKUP and RESTORE.
Epic: none.

Co-authored-by: David Taylor <tinystatemachine@gmail.com>
  • Loading branch information
craig[bot] and dt committed Feb 26, 2024
2 parents 549ed7e + 85086e4 commit c6b9696
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
3 changes: 2 additions & 1 deletion pkg/ccl/backupccl/backupdest/backup_destination.go
Original file line number Diff line number Diff line change
Expand Up @@ -280,13 +280,14 @@ func ReadLatestFile(
defer collection.Close()

latestFile, err := FindLatestFile(ctx, collection)

if err != nil {
if errors.Is(err, cloud.ErrFileDoesNotExist) {
return "", pgerror.Wrapf(err, pgcode.UndefinedFile, "path does not contain a completed latest backup")
}
return "", pgerror.WithCandidateCode(err, pgcode.Io)
}
defer latestFile.Close(ctx)

latest, err := ioctx.ReadAll(ctx, latestFile)
if err != nil {
return "", err
Expand Down
13 changes: 12 additions & 1 deletion pkg/ccl/backupccl/restore_span_covering.go
Original file line number Diff line number Diff line change
Expand Up @@ -286,16 +286,21 @@ func generateAndSendImportSpans(
if err != nil {
return err
}
defer startKeyIt.Close()

var key roachpb.Key

fileIterByLayer := make([]bulk.Iterator[*backuppb.BackupManifest_File], 0, len(backups))
defer func() {
for _, i := range fileIterByLayer {
i.Close()
}
}()
for layer := range backups {
iter, err := layerToBackupManifestFileIterFactory[layer].NewFileIter(ctx)
if err != nil {
return err
}

fileIterByLayer = append(fileIterByLayer, iter)
}

Expand Down Expand Up @@ -484,6 +489,12 @@ func newFileSpanStartKeyIterator(
return it, nil
}

func (i *fileSpanStartKeyIterator) Close() {
for _, iter := range i.allIters {
iter.Close()
}
}

func (i *fileSpanStartKeyIterator) next() {
if ok, _ := i.valid(); !ok {
return
Expand Down

0 comments on commit c6b9696

Please sign in to comment.