KurlesHS/restic
1
0
Fork 0
forked from TrueCloudLab/restic
Code Pull requests Activity

Merge pull request #1399 from armhold/deadlock2

Browse source 
prevent deadlock in List() for B2 when b2.connections=1
This commit is contained in:
Alexander Neumann 2017-10-29 09:26:46 +01:00
commit f854a41ba9
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
internal/backend/b2/b2.go
View file

@ -307,18 +307,17 @@ func (be *b2Backend) List(ctx context.Context, t restic.FileType) <-chan string
ctx, cancel := context.WithCancel(ctx) ctx, cancel := context.WithCancel(ctx)
be.sem.GetToken()
go func() { go func() {
defer close(ch) defer close(ch)
defer cancel() defer cancel()
defer be.sem.ReleaseToken()
prefix := be.Dirname(restic.Handle{Type: t}) prefix := be.Dirname(restic.Handle{Type: t})
cur := &b2.Cursor{Prefix: prefix} cur := &b2.Cursor{Prefix: prefix}
for { for {
be.sem.GetToken()
objs, c, err := be.bucket.ListCurrentObjects(ctx, be.listMaxItems, cur) objs, c, err := be.bucket.ListCurrentObjects(ctx, be.listMaxItems, cur)
be.sem.ReleaseToken()
if err != nil && err != io.EOF { if err != nil && err != io.EOF {
return return
} }