mirror of
https://github.com/pgsty/minio.git
synced 2026-08-10 16:23:28 +03:00
fix: allocate buffer to required size than readSizeV1 (#2095)
Refer #2077
This commit is contained in:
+13
-4
@@ -304,10 +304,15 @@ func (fs fsObjects) PutObjectPart(bucket, object, uploadID string, partID int, s
|
||||
limitDataReader = data
|
||||
}
|
||||
|
||||
// Allocate 128KiB buffer for staging buffer.
|
||||
var buf = make([]byte, readSizeV1)
|
||||
// Allocate buffer for staging buffer.
|
||||
bufSize := int64(readSizeV1)
|
||||
if size > 0 && bufSize > size {
|
||||
bufSize = size
|
||||
}
|
||||
var buf = make([]byte, int(bufSize))
|
||||
|
||||
// Read till io.EOF.
|
||||
// Read up to required size
|
||||
totalLeft := size
|
||||
for {
|
||||
n, err := io.ReadFull(limitDataReader, buf)
|
||||
if err == io.EOF {
|
||||
@@ -321,6 +326,10 @@ func (fs fsObjects) PutObjectPart(bucket, object, uploadID string, partID int, s
|
||||
if err = fs.storage.AppendFile(minioMetaBucket, tmpPartPath, buf[:n]); err != nil {
|
||||
return "", toObjectErr(err, bucket, object)
|
||||
}
|
||||
|
||||
if totalLeft -= int64(n); size >= 0 && totalLeft <= 0 {
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
// Validate if payload is valid.
|
||||
@@ -509,7 +518,7 @@ func (fs fsObjects) CompleteMultipartUpload(bucket string, object string, upload
|
||||
|
||||
tempObj := path.Join(tmpMetaPrefix, uploadID, "part.1")
|
||||
|
||||
// Allocate 128KiB of staging buffer.
|
||||
// Allocate staging buffer.
|
||||
var buf = make([]byte, readSizeV1)
|
||||
|
||||
// Loop through all parts, validate them and then commit to disk.
|
||||
|
||||
Reference in New Issue
Block a user