github-mirror/rclone
2
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2025-02-01 06:36:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

acd: Only wait for uploads to appear on 408,500,504 errors - fixes #712

Browse Source
This commit is contained in:
Nick Craig-Wood 2016-09-12 17:47:01 +01:00
parent cf43ca2a7b
commit 20a429c048
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
amazonclouddrive/amazonclouddrive.go
View File

@ -478,11 +478,15 @@ func (f *Fs) List(out fs.ListOpts, dir string) {
// At the end of large uploads. The speculation is that the timeout // At the end of large uploads. The speculation is that the timeout
// is waiting for the sha1 hashing to complete and the file may well // is waiting for the sha1 hashing to complete and the file may well
// be properly uploaded. // be properly uploaded.
func (f *Fs) checkUpload(in io.Reader, src fs.ObjectInfo, inInfo *acd.File, inErr error) (fixedError bool, info *acd.File, err error) { func (f *Fs) checkUpload(resp *http.Response, in io.Reader, src fs.ObjectInfo, inInfo *acd.File, inErr error) (fixedError bool, info *acd.File, err error) {
// Return if no error - all is well // Return if no error - all is well
if inErr == nil { if inErr == nil {
return false, inInfo, inErr return false, inInfo, inErr
} }
// If not one of the errors we can fix return
if resp == nil || resp.StatusCode != 408 && resp.StatusCode != 500 && resp.StatusCode != 504 {
return false, inInfo, inErr
}
const sleepTime = 5 * time.Second // sleep between tries const sleepTime = 5 * time.Second // sleep between tries
retries := int(*uploadWaitTime / sleepTime) // number of retries retries := int(*uploadWaitTime / sleepTime) // number of retries
if retries <= 0 { if retries <= 0 {
@ -561,7 +565,7 @@ func (f *Fs) Put(in io.Reader, src fs.ObjectInfo) (fs.Object, error) {
} }
f.stopUpload() f.stopUpload()
var ok bool var ok bool
ok, info, err = f.checkUpload(in, src, info, err) ok, info, err = f.checkUpload(resp, in, src, info, err)
if ok { if ok {
return false, nil return false, nil
} }
@ -818,7 +822,7 @@ func (o *Object) Update(in io.Reader, src fs.ObjectInfo) error {
} }
o.fs.stopUpload() o.fs.stopUpload()
var ok bool var ok bool
ok, info, err = o.fs.checkUpload(in, src, info, err) ok, info, err = o.fs.checkUpload(resp, in, src, info, err)
if ok { if ok {
return false, nil return false, nil
} }