MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-01-23 12:43:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Disable DMA optimization on windows (#18575)

Browse Source 
It appears that Windows can lock up when errors occur. Use regular copy here.
This commit is contained in:
Klaus Post 2023-12-01 16:13:19 -08:00 committed by GitHub
parent c397fb6c7a
commit 69294cf98a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/storage-rest-server.go
View File

@ -29,6 +29,7 @@ import (
"net/http"
"os/user"
"path"
"runtime"
"runtime/debug"
"strconv"
"strings"
@ -641,9 +642,10 @@ func (s *storageRESTServer) ReadFileStreamHandler(w http.ResponseWriter, r *http
defer rc.Close()
rf, ok := w.(io.ReaderFrom)
if ok {
if ok && runtime.GOOS != "windows" {
// Attempt to use splice/sendfile() optimization, A very specific behavior mentioned below is necessary.
// See https://github.com/golang/go/blob/f7c5cbb82087c55aa82081e931e0142783700ce8/src/net/sendfile_linux.go#L20
// Windows can lock up with this optimization, so we fall back to regular copy.
dr, ok := rc.(*xioutil.DeadlineReader)
if ok {
sr, ok := dr.ReadCloser.(*sendFileReader)

4
internal/http/response-recorder.go
View File

@ -80,7 +80,9 @@ var ErrNotImplemented = errors.New("not implemented")
// returns an error if the underlying ResponseWriter does not implement io.ReaderFrom
func (lrw *ResponseRecorder) ReadFrom(r io.Reader) (int64, error) {
if lrw.ReaderFrom != nil {
return lrw.ReaderFrom.ReadFrom(r)
n, err := lrw.ReaderFrom.ReadFrom(r)
lrw.bytesWritten += int(n)
return n, err
}
return 0, ErrNotImplemented
}