Adding error handling for network errors in the SFTP layer (#18442)

cmd/sftp-server-driver.go

@@ -201,23 +201,40 @@ func (f *sftpDriver) Fileread(r *sftp.Request) (ra io.ReaderAt, err error) {
 	return obj, nil
 }
 
+// TransferError will catch network errors during transfer.
+// When TransferError() is called Close() will also
+// be called, so we do not need to Wait() here.
+func (w *writerAt) TransferError(err error) {
+	_ = w.w.CloseWithError(err)
+	_ = w.r.CloseWithError(err)
+	w.err = err
+}
+
 func (w *writerAt) Close() (err error) {
-	if len(w.buffer) > 0 {
+	switch {
-		err = w.w.CloseWithError(errors.New("some file segments were not flushed from the queue"))
+	case len(w.buffer) > 0:
-		for i := range w.buffer {
+		err = errors.New("some file segments were not flushed from the queue")
-			delete(w.buffer, i)
+		_ = w.w.CloseWithError(err)
-		}
+	case w.err != nil:
-	} else {
+		// No need to close here since both pipes were
+		// closing inside TransferError()
+		err = w.err
+	default:
 		err = w.w.Close()
 	}
+	for i := range w.buffer {
+		delete(w.buffer, i)
+	}
 	w.wg.Wait()
 	return err
 }
 
 type writerAt struct {
 	w      *io.PipeWriter
+	r      *io.PipeReader
 	wg     *sync.WaitGroup
 	buffer map[int64][]byte
+	err    error
 
 	nextOffset int64
 	m          sync.Mutex
@@ -279,6 +296,7 @@ func (f *sftpDriver) Filewrite(r *sftp.Request) (w io.WriterAt, err error) {
 	wa := &writerAt{
 		buffer: make(map[int64][]byte),
 		w:      pw,
+		r:      pr,
 		wg:     &sync.WaitGroup{},
 	}
 	wa.wg.Add(1)