MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-01-13 07:53:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #650 from harshavardhana/pr_out_add_time_since_on_buckets_created_time_to_avoid_deleting_buckets_spuriously_during_eviction_of_objects

Browse Source
This commit is contained in:
Harshavardhana 2015-06-13 11:30:06 -07:00
commit 6b8766790b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,6 +44,7 @@ type memoryDriver struct {
objects *trove.Cache objects *trove.Cache
multiPartObjects *trove.Cache multiPartObjects *trove.Cache
maxSize uint64 maxSize uint64
expiration time.Duration
} }
type storedBucket struct { type storedBucket struct {
@ -73,6 +74,7 @@ func Start(maxSize uint64, expiration time.Duration) (chan<- string, <-chan erro
memory.storedBuckets = make(map[string]storedBucket) memory.storedBuckets = make(map[string]storedBucket)
memory.objects = trove.NewCache(maxSize, expiration) memory.objects = trove.NewCache(maxSize, expiration)
memory.maxSize = maxSize memory.maxSize = maxSize
memory.expiration = expiration
memory.multiPartObjects = trove.NewCache(0, time.Duration(0)) memory.multiPartObjects = trove.NewCache(0, time.Duration(0))
memory.lock = new(sync.RWMutex) memory.lock = new(sync.RWMutex)
@ -517,7 +519,9 @@ func (memory *memoryDriver) expiredObject(a ...interface{}) {
delete(storedBucket.objectMetadata, key) delete(storedBucket.objectMetadata, key)
// remove bucket if no objects found anymore // remove bucket if no objects found anymore
if len(storedBucket.objectMetadata) == 0 { if len(storedBucket.objectMetadata) == 0 {
delete(memory.storedBuckets, bucket) if time.Since(memory.storedBuckets[bucket].bucketMetadata.Created) > memory.expiration {
delete(memory.storedBuckets, bucket)
}
} }
} }
debug.FreeOSMemory() debug.FreeOSMemory()