maxmustermann/minio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #533 from fkautz/pr_out_simplifying_memory_sleep_logic

Browse source
This commit is contained in:
Frederick F. Kautz IV 2015-04-29 13:55:24 -07:00
parent 362305d898 8fcb697844
commit b6daf99dcd
1 changed files with 18 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -484,13 +484,10 @@ func (memory *memoryDriver) expireObjects() {
return return
} }
var keysToRemove []string var keysToRemove []string
if len(memory.objectMetadata) > 0 {
memory.lock.RLock() memory.lock.RLock()
var earliest time.Time var earliest time.Time
empty := true
for key, object := range memory.objectMetadata { for key, object := range memory.objectMetadata {
if empty {
empty = false
}
if time.Now().Add(-memory.expiration).After(object.metadata.Created) { if time.Now().Add(-memory.expiration).After(object.metadata.Created) {
keysToRemove = append(keysToRemove, key) keysToRemove = append(keysToRemove, key)
} else { } else {
@ -505,13 +502,12 @@ func (memory *memoryDriver) expireObjects() {
memory.objects.Remove(key) memory.objects.Remove(key)
} }
memory.lock.Unlock() memory.lock.Unlock()
if empty {
time.Sleep(memory.expiration)
} else {
sleepFor := earliest.Sub(time.Now()) sleepFor := earliest.Sub(time.Now())
if sleepFor > 0 { if sleepFor > 0 {
time.Sleep(sleepFor) time.Sleep(sleepFor)
} }
} else {
time.Sleep(memory.expiration)
} }
} }
} }