upstream/restic
1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2026-02-03 04:20:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

repository: prevent test deadlock within WithBlobUploader

Browse source 
Calling t.Fatal internally triggers runtime.Goexit . This kills the
current goroutine while only running deferred code. Add an extra context
that gets canceled if the go routine exits while within the user
provided callback.
This commit is contained in:
Michael Eischer 2025-11-21 22:29:31 +01:00
parent d82ea53735
commit f84d398989
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
internal/repository/repository.go
View file

@ -562,6 +562,8 @@ func (r *Repository) removeUnpacked(ctx context.Context, t restic.FileType, id r
}
func (r *Repository) WithBlobUploader(ctx context.Context, fn func(ctx context.Context, uploader restic.BlobSaverWithAsync) error) error {
ctx, cancel := context.WithCancel(ctx)
defer cancel()
wg, ctx := errgroup.WithContext(ctx)
// pack uploader + wg.Go below + blob saver (CPU bound)
wg.SetLimit(2 + runtime.GOMAXPROCS(0))
@ -570,7 +572,18 @@ func (r *Repository) WithBlobUploader(ctx context.Context, fn func(ctx context.C
// blob saver are spawned on demand, use wait group to keep track of them
r.blobSaver = &sync.WaitGroup{}
wg.Go(func() error {
if err := fn(ctx, &blobSaverRepo{repo: r}); err != nil {
inCallback := true
defer func() {
// when the defer is called while inCallback is true, this means
// that runtime.Goexit was called within `fn`. This should only happen
// if a test uses t.Fatal within `fn`.
if inCallback {
cancel()
}
}()
err := fn(ctx, &blobSaverRepo{repo: r})
inCallback = false
if err != nil {
return err
}
if err := r.flush(ctx); err != nil {