operations: make reopen code error on NoLowLevelRetry errors - fixes rclone#3777

ncw · ncw · commit 4537d9b5cf29 · 2019-12-06T10:54:03.000Z
diff --git a/fs/operations/reopen.go b/fs/operations/reopen.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/pkg/errors"
 	"github.com/rclone/rclone/fs"
+	"github.com/rclone/rclone/fs/fserrors"
 )
 
 // reOpen is a wrapper for an object reader which reopens the stream on error
@@ -104,7 +105,7 @@ func (h *reOpen) Read(p []byte) (n int, err error) {
 		h.err = err
 	}
 	h.read += int64(n)
-	if err != nil && err != io.EOF {
+	if err != nil && err != io.EOF && !fserrors.IsNoLowLevelRetryError(err) {
 		// close underlying stream
 		h.opened = false
 		_ = h.rc.Close()

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ import (`
`7`	`7`
`8`	`8`	`"github.com/pkg/errors"`
`9`	`9`	`"github.com/rclone/rclone/fs"`
	`10`	`+ "github.com/rclone/rclone/fs/fserrors"`
`10`	`11`	`)`
`11`	`12`
`12`	`13`	`// reOpen is a wrapper for an object reader which reopens the stream on error`
`@@ -104,7 +105,7 @@ func (h *reOpen) Read(p []byte) (n int, err error) {`
`104`	`105`	`h.err = err`
`105`	`106`	`}`
`106`	`107`	`h.read += int64(n)`
`107`		`- if err != nil && err != io.EOF {`
	`108`	`+ if err != nil && err != io.EOF && !fserrors.IsNoLowLevelRetryError(err) {`
`108`	`109`	`// close underlying stream`
`109`	`110`	`h.opened = false`
`110`	`111`	`_ = h.rc.Close()`