MyFavMirrors
/
minio
mirror of https://github.com/minio/minio.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #687 from harshavardhana/pr_out_move_to_set_not_append_due_to_large_memory_reference_copy

This commit is contained in:
Harshavardhana 2015-06-28 17:15:06 +00:00
parent 22abe1b397 91e5f648cb
commit b2bf90afbd
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkg/storage/drivers/donut/donut.go
View File

@ -500,9 +500,8 @@ func (d donutDriver) ListObjects(bucketName string, resources drivers.BucketReso
} }
type proxyReader struct { type proxyReader struct {
reader io.Reader reader io.Reader
driver donutDriver readBytes []byte
object string
} }
func (r *proxyReader) free(p []byte) { func (r *proxyReader) free(p []byte) {
@ -513,24 +512,18 @@ func (r *proxyReader) Read(p []byte) (n int, err error) {
defer r.free(p) defer r.free(p)
n, err = r.reader.Read(p) n, err = r.reader.Read(p)
if err == io.EOF || err == io.ErrUnexpectedEOF { if err == io.EOF || err == io.ErrUnexpectedEOF {
ok := r.driver.objects.Append(r.object, p[0:n]) r.readBytes = append(r.readBytes, p[0:n]...)
if !ok {
return n, io.ErrShortBuffer
}
return return
} }
if err != nil { if err != nil {
return return
} }
ok := r.driver.objects.Append(r.object, p[0:n]) r.readBytes = append(r.readBytes, p[0:n]...)
if !ok {
return n, io.ErrShortBuffer
}
return return
} }
func newProxyReader(r io.Reader, d donutDriver, k string) *proxyReader { func newProxyReader(r io.Reader) *proxyReader {
return &proxyReader{reader: r, driver: d, object: k} return &proxyReader{reader: r, readBytes: nil}
} }
// CreateObject creates a new object // CreateObject creates a new object
@ -578,7 +571,7 @@ func (d donutDriver) CreateObject(bucketName, objectName, contentType, expectedM
} }
expectedMD5Sum = hex.EncodeToString(expectedMD5SumBytes) expectedMD5Sum = hex.EncodeToString(expectedMD5SumBytes)
} }
newReader := newProxyReader(reader, d, objectKey) newReader := newProxyReader(reader)
calculatedMD5Sum, err := d.donut.PutObject(bucketName, objectName, expectedMD5Sum, newReader, metadata) calculatedMD5Sum, err := d.donut.PutObject(bucketName, objectName, expectedMD5Sum, newReader, metadata)
if err != nil { if err != nil {
switch iodine.ToError(err).(type) { switch iodine.ToError(err).(type) {
@ -587,6 +580,10 @@ func (d donutDriver) CreateObject(bucketName, objectName, contentType, expectedM
} }
return "", iodine.New(err, errParams) return "", iodine.New(err, errParams)
} }
d.objects.Set(objectKey, newReader.readBytes)
// free up
newReader.readBytes = nil
go debug.FreeOSMemory()
objectMetadata, err := d.donut.GetObjectMetadata(bucketName, objectName) objectMetadata, err := d.donut.GetObjectMetadata(bucketName, objectName)
if err != nil { if err != nil {
return "", iodine.New(err, nil) return "", iodine.New(err, nil)