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

Merge pull request #518 from fkautz/pr_out_critical_sections_are_now_protected_by_lock

This commit is contained in:
Frederick F. Kautz IV 2015-04-27 20:01:51 -07:00
parent b85595addf f2257a643c
commit 2c3329a519
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/api/quota/quota_handler.go
View File

@ -33,6 +33,8 @@ type quotaMap struct {
}
func (q *quotaMap) CanExpire() {
q.Lock()
defer q.Unlock()
currentMinute := time.Now().UnixNano() / q.segmentSize.Nanoseconds()
// divide by segmentSize, otherwise expiredQuotas will always be negative
expiredQuotas := currentMinute - (q.duration.Nanoseconds() / q.segmentSize.Nanoseconds())
@ -44,9 +46,9 @@ func (q *quotaMap) CanExpire() {
}
func (q *quotaMap) Add(ip uint32, size int64) {
q.CanExpire()
q.Lock()
defer q.Unlock()
q.CanExpire()
currentMinute := time.Now().UnixNano() / q.segmentSize.Nanoseconds()
if _, ok := q.data[currentMinute]; !ok {
q.data[currentMinute] = make(map[uint32]int64)
@ -65,10 +67,9 @@ func (q *quotaMap) IsQuotaMet(ip uint32) bool {
}
func (q *quotaMap) GetQuotaUsed(ip uint32) (total int64) {
currentMinute := time.Now().UnixNano() / q.segmentSize.Nanoseconds()
if _, ok := q.data[currentMinute]; !ok {
q.data[currentMinute] = make(map[uint32]int64)
}
q.CanExpire()
q.RLock()
defer q.RUnlock()
for _, segment := range q.data {
if used, ok := segment[ip]; ok {
total += used