alexvanin/rclone
1
0
Fork 0
forked from TrueCloudLab/rclone
Code Pull requests Activity

ftp: fix deadlock after failed update when concurrency=1

Browse source
This commit is contained in:
Ivan Andreev 2021-08-19 18:58:44 +03:00
parent bb0c4ad2d8
commit 69f4b48719
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
backend/ftp/ftp.go
View file

@ -1062,8 +1062,9 @@ func (o *Object) Update(ctx context.Context, in io.Reader, src fs.ObjectInfo, op
} }
if err != nil { if err != nil {
_ = c.Quit() // toss this connection to avoid sync errors _ = c.Quit() // toss this connection to avoid sync errors
remove() // recycle connection in advance to let remove() find free token
o.fs.putFtpConnection(nil, err) o.fs.putFtpConnection(nil, err)
remove()
return errors.Wrap(err, "update stor") return errors.Wrap(err, "update stor")
} }
o.fs.putFtpConnection(&c, nil) o.fs.putFtpConnection(&c, nil)