MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-05-21 17:43:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "xl: CreateFile shouldn't prematurely timeout (#11854)"

Browse Source 
This reverts commit 922c7b57f569055b98d48d59677e2019e55e3e16.
This commit is contained in:
Harshavardhana 2021-03-23 23:47:13 -07:00
parent e80239a661
commit 21cfc4aa49
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/data-scanner.go
View File

@ -44,7 +44,7 @@ import (
const ( const (
dataScannerSleepPerFolder = time.Millisecond // Time to wait between folders. dataScannerSleepPerFolder = time.Millisecond // Time to wait between folders.
dataScannerStartDelay = 5 * time.Minute // Time to wait on startup and between cycles. dataScannerStartDelay = 1 * time.Minute // Time to wait on startup and between cycles.
dataUsageUpdateDirCycles = 16 // Visit all folders every n cycles. dataUsageUpdateDirCycles = 16 // Visit all folders every n cycles.
healDeleteDangling = true healDeleteDangling = true

6
cmd/storage-rest-client.go
View File

@ -337,10 +337,8 @@ func (client *storageRESTClient) CreateFile(ctx context.Context, volume, path st
values.Set(storageRESTFilePath, path) values.Set(storageRESTFilePath, path)
values.Set(storageRESTLength, strconv.Itoa(int(size))) values.Set(storageRESTLength, strconv.Itoa(int(size)))
respBody, err := client.call(ctx, storageRESTMethodCreateFile, values, ioutil.NopCloser(reader), size) respBody, err := client.call(ctx, storageRESTMethodCreateFile, values, ioutil.NopCloser(reader), size)
if err != nil { defer http.DrainBody(respBody)
return err return err
}
return waitForHTTPStream(respBody, ioutil.Discard)
} }
func (client *storageRESTClient) WriteMetadata(ctx context.Context, volume, path string, fi FileInfo) error { func (client *storageRESTClient) WriteMetadata(ctx context.Context, volume, path string, fi FileInfo) error {

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

@ -287,10 +287,10 @@ func (s *storageRESTServer) CreateFileHandler(w http.ResponseWriter, r *http.Req
s.writeErrorResponse(w, err) s.writeErrorResponse(w, err)
return return
} }
err = s.storage.CreateFile(r.Context(), volume, filePath, int64(fileSize), r.Body)
done := keepHTTPResponseAlive(w) if err != nil {
done(s.storage.CreateFile(r.Context(), volume, filePath, int64(fileSize), r.Body)) s.writeErrorResponse(w, err)
w.(http.Flusher).Flush() }
} }
// DeleteVersion delete updated metadata. // DeleteVersion delete updated metadata.