diff options
Diffstat (limited to 'weed/util')
| -rw-r--r-- | weed/util/chunk_cache/chunk_cache.go | 6 | ||||
| -rw-r--r-- | weed/util/chunk_cache/chunk_cache_on_disk_test.go | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/weed/util/chunk_cache/chunk_cache.go b/weed/util/chunk_cache/chunk_cache.go index 158f47cfc..7ed009b45 100644 --- a/weed/util/chunk_cache/chunk_cache.go +++ b/weed/util/chunk_cache/chunk_cache.go @@ -23,14 +23,16 @@ type TieredChunkCache struct { onDiskCacheSizeLimit0 uint64 onDiskCacheSizeLimit1 uint64 onDiskCacheSizeLimit2 uint64 + forceCache bool } var _ ChunkCache = &TieredChunkCache{} -func NewTieredChunkCache(maxEntries int64, dir string, diskSizeInUnit int64, unitSize int64) *TieredChunkCache { +func NewTieredChunkCache(maxEntries int64, dir string, diskSizeInUnit int64, unitSize int64, forceCache bool) *TieredChunkCache { c := &TieredChunkCache{ - memCache: NewChunkCacheInMemory(maxEntries), + memCache: NewChunkCacheInMemory(maxEntries), + forceCache: forceCache, } c.diskCaches = make([]*OnDiskCacheLayer, 3) c.onDiskCacheSizeLimit0 = uint64(unitSize) diff --git a/weed/util/chunk_cache/chunk_cache_on_disk_test.go b/weed/util/chunk_cache/chunk_cache_on_disk_test.go index 14179beaa..8a517b486 100644 --- a/weed/util/chunk_cache/chunk_cache_on_disk_test.go +++ b/weed/util/chunk_cache/chunk_cache_on_disk_test.go @@ -13,7 +13,7 @@ func TestOnDisk(t *testing.T) { totalDiskSizeInKB := int64(32) - cache := NewTieredChunkCache(2, tmpDir, totalDiskSizeInKB, 1024) + cache := NewTieredChunkCache(2, tmpDir, totalDiskSizeInKB, 1024, false) writeCount := 5 type test_data struct { @@ -61,7 +61,7 @@ func TestOnDisk(t *testing.T) { cache.Shutdown() - cache = NewTieredChunkCache(2, tmpDir, totalDiskSizeInKB, 1024) + cache = NewTieredChunkCache(2, tmpDir, totalDiskSizeInKB, 1024, false) for i := 0; i < 2; i++ { data := mem.Allocate(testData[i].size) |