astelm/minio
1
0
Fork 0
mirror of https://github.com/pgsty/minio.git synced 2026-07-22 05:30:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

FS/PutObject: Read() data should be handled even in case of EOF. (#1864)

Browse Source 
Fixes #1710
This commit is contained in:
Krishna Srinivas
2016-06-09 10:30:31 +05:30
committed by Harshavardhana
parent 51f3d4e0ca
commit 1b9db9ee6c
2 changed files with 89 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fs-v1.go
+21 -13
View File
@@ -215,7 +215,9 @@ func (fs fsObjects) PutObject(bucket string, object string, size int64, data io.
uniqueID := getUUID()
// Temporary object.
// Uploaded object will first be written to the temporary location which will eventually
// be renamed to the actual location. It is first written to the temporary location
// so that cleaning it up will be easy if the server goes down.
tempObj := path.Join(tmpMetaPrefix, uniqueID)
// Initialize md5 writer.
@@ -228,24 +230,28 @@ func (fs fsObjects) PutObject(bucket string, object string, size int64, data io.
return "", toObjectErr(err, bucket, object)
}
} else {
// Allocate buffer.
// Allocate a buffer to Read() the object upload stream.
buf := make([]byte, blockSizeV1)
// Read the buffer till io.EOF and append the read data to
// the temporary file.
for {
n, rErr := data.Read(buf)
if rErr == io.EOF {
break
}
if rErr != nil {
if rErr != nil && rErr != io.EOF {
return "", toObjectErr(rErr, bucket, object)
}
// Update md5 writer.
md5Writer.Write(buf[:n])
m, wErr := fs.storage.AppendFile(minioMetaBucket, tempObj, buf[:n])
if wErr != nil {
return "", toObjectErr(wErr, bucket, object)
if n > 0 {
// Update md5 writer.
md5Writer.Write(buf[:n])
m, wErr := fs.storage.AppendFile(minioMetaBucket, tempObj, buf[:n])
if wErr != nil {
return "", toObjectErr(wErr, bucket, object)
}
if m != int64(n) {
return "", toObjectErr(errUnexpected, bucket, object)
}
}
if m != int64(len(buf[:n])) {
return "", toObjectErr(errUnexpected, bucket, object)
if rErr == io.EOF {
break
}
}
}
@@ -262,6 +268,8 @@ func (fs fsObjects) PutObject(bucket string, object string, size int64, data io.
}
}
// Entire object was written to the temp location, now it's safe to rename it
// to the actual location.
err := fs.storage.RenameFile(minioMetaBucket, tempObj, bucket, object)
if err != nil {
return "", toObjectErr(err, bucket, object)