MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2024-12-28 08:05:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #544 from fkautz/pr_out_fixing_race_condition

Browse Source
This commit is contained in:
Frederick F. Kautz IV 2015-04-29 18:57:05 -07:00
commit 73de05feb6
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -501,9 +501,9 @@ func (memory *memoryDriver) expireObjects() {
if memory.shutdown { if memory.shutdown {
return return
} }
var sleepDuration time.Duration
memory.lock.Lock()
if len(memory.objectMetadata) > 0 { if len(memory.objectMetadata) > 0 {
var sleepDuration time.Duration
memory.lock.Lock()
if k, _, ok := memory.objects.GetOldest(); ok { if k, _, ok := memory.objects.GetOldest(); ok {
key := k.(string) key := k.(string)
object := memory.objectMetadata[key] object := memory.objectMetadata[key]
@ -513,11 +513,11 @@ func (memory *memoryDriver) expireObjects() {
sleepDuration = memory.expiration - time.Now().Sub(object.lastAccessed) sleepDuration = memory.expiration - time.Now().Sub(object.lastAccessed)
} }
} }
memory.lock.Unlock()
time.Sleep(sleepDuration)
} else { } else {
time.Sleep(memory.expiration) sleepDuration = memory.expiration
} }
memory.lock.Unlock()
time.Sleep(sleepDuration)
} }
} }