MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-01-28 15:06:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #515 from fkautz/pr_out_fix_multiple_response_writeheader_calls

Browse Source 
Fix multiple response.WriteHeader calls
This commit is contained in:
Harshavardhana 2015-04-27 19:21:47 -07:00
commit 7bdcf4bbf3
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/api/quota/bandwidth_cap.go
View File

@ -24,6 +24,8 @@ import (
"time" "time"
"github.com/minio-io/minio/pkg/iodine" "github.com/minio-io/minio/pkg/iodine"
"github.com/minio-io/minio/pkg/utils/log"
"sync"
) )
// bandwidthQuotaHandler // bandwidthQuotaHandler
@ -40,17 +42,20 @@ func (h *bandwidthQuotaHandler) ServeHTTP(w http.ResponseWriter, req *http.Reque
writeErrorResponse(w, req, BandWidthInsufficientToProceed, req.URL.Path) writeErrorResponse(w, req, BandWidthInsufficientToProceed, req.URL.Path)
return return
} }
req.Body = &quotaReader{ qr := &quotaReader{
ReadCloser: req.Body, ReadCloser: req.Body,
quotas: h.quotas, quotas: h.quotas,
ip: longIP, ip: longIP,
w: w, w: w,
req: req, req: req,
lock: &sync.RWMutex{},
} }
req.Body = qr
w = &quotaWriter{ w = &quotaWriter{
ResponseWriter: w, ResponseWriter: w,
quotas: h.quotas, quotas: h.quotas,
ip: longIP, ip: longIP,
quotaReader: qr,
} }
h.handler.ServeHTTP(w, req) h.handler.ServeHTTP(w, req)
} }
@ -75,13 +80,19 @@ type quotaReader struct {
w http.ResponseWriter w http.ResponseWriter
req *http.Request req *http.Request
err bool err bool
lock *sync.RWMutex
} }
func (q *quotaReader) Read(b []byte) (int, error) { func (q *quotaReader) Read(b []byte) (int, error) {
log.Println(q.quotas.GetQuotaUsed(q.ip))
log.Println(q.quotas.limit)
q.lock.Lock()
defer q.lock.Unlock()
if q.err { if q.err {
return 0, iodine.New(errors.New("Quota Met"), nil) return 0, iodine.New(errors.New("Quota Met"), nil)
} }
if q.quotas.IsQuotaMet(q.ip) { if q.err == false && q.quotas.IsQuotaMet(q.ip) {
defer q.lock.Unlock()
q.err = true q.err = true
writeErrorResponse(q.w, q.req, BandWidthQuotaExceeded, q.req.URL.Path) writeErrorResponse(q.w, q.req, BandWidthQuotaExceeded, q.req.URL.Path)
return 0, iodine.New(errors.New("Quota Met"), nil) return 0, iodine.New(errors.New("Quota Met"), nil)
@ -99,9 +110,12 @@ type quotaWriter struct {
ResponseWriter http.ResponseWriter ResponseWriter http.ResponseWriter
quotas *quotaMap quotas *quotaMap
ip uint32 ip uint32
quotaReader *quotaReader
} }
func (q *quotaWriter) Write(b []byte) (int, error) { func (q *quotaWriter) Write(b []byte) (int, error) {
q.quotaReader.lock.RLock()
defer q.quotaReader.lock.RUnlock()
if q.quotas.IsQuotaMet(q.ip) { if q.quotas.IsQuotaMet(q.ip) {
return 0, iodine.New(errors.New("Quota Met"), nil) return 0, iodine.New(errors.New("Quota Met"), nil)
} }
@ -116,7 +130,9 @@ func (q *quotaWriter) Header() http.Header {
} }
func (q *quotaWriter) WriteHeader(status int) { func (q *quotaWriter) WriteHeader(status int) {
if q.quotas.IsQuotaMet(q.ip) { q.quotaReader.lock.RLock()
defer q.quotaReader.lock.RUnlock()
if q.quotas.IsQuotaMet(q.ip) || q.quotaReader.err {
return return
} }
q.ResponseWriter.WriteHeader(status) q.ResponseWriter.WriteHeader(status)

4
pkg/storage/drivers/memory/memory.go
View File

@ -245,7 +245,9 @@ func (memory *memoryDriver) CreateObject(bucket, key, contentType, expectedMD5Su
summer.Write(chunk.Data) summer.Write(chunk.Data)
_, err := io.Copy(&bytesBuffer, bytes.NewBuffer(chunk.Data)) _, err := io.Copy(&bytesBuffer, bytes.NewBuffer(chunk.Data))
if err != nil { if err != nil {
return iodine.New(err, nil) err := iodine.New(err, nil)
log.Println(err)
return err
} }
if uint64(totalLength) > memory.maxSize { if uint64(totalLength) > memory.maxSize {
return iodine.New(drivers.EntityTooLarge{ return iodine.New(drivers.EntityTooLarge{