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

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

@ -484,34 +484,30 @@ func (memory *memoryDriver) expireObjects() {
return return
} }
var keysToRemove []string var keysToRemove []string
memory.lock.RLock() if len(memory.objectMetadata) > 0 {
var earliest time.Time memory.lock.RLock()
empty := true var earliest time.Time
for key, object := range memory.objectMetadata { for key, object := range memory.objectMetadata {
if empty { if time.Now().Add(-memory.expiration).After(object.metadata.Created) {
empty = false keysToRemove = append(keysToRemove, key)
} } else {
if time.Now().Add(-memory.expiration).After(object.metadata.Created) { if object.metadata.Created.Before(earliest) {
keysToRemove = append(keysToRemove, key) earliest = object.metadata.Created
} else { }
if object.metadata.Created.Before(earliest) {
earliest = object.metadata.Created
} }
} }
} memory.lock.RUnlock()
memory.lock.RUnlock() memory.lock.Lock()
memory.lock.Lock() for _, key := range keysToRemove {
for _, key := range keysToRemove { 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)
} }
} }
} }