diff options
| author | chrislu <chris.lu@gmail.com> | 2024-09-04 01:38:29 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2024-09-04 01:38:29 -0700 |
| commit | 18afdb15b6df2835ca600d566997fa7410e1ec9b (patch) | |
| tree | baabf17ce97f2533571420ff1a9563406fac8425 /weed/util | |
| parent | 7367b976b05bfa69158a60f205dec970c48f50f0 (diff) | |
| download | seaweedfs-18afdb15b6df2835ca600d566997fa7410e1ec9b.tar.xz seaweedfs-18afdb15b6df2835ca600d566997fa7410e1ec9b.zip | |
Revert "weed mount, weed dav add option to force cache"
This reverts commit 7367b976b05bfa69158a60f205dec970c48f50f0.
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, 4 insertions, 6 deletions
diff --git a/weed/util/chunk_cache/chunk_cache.go b/weed/util/chunk_cache/chunk_cache.go index 7ed009b45..158f47cfc 100644 --- a/weed/util/chunk_cache/chunk_cache.go +++ b/weed/util/chunk_cache/chunk_cache.go @@ -23,16 +23,14 @@ type TieredChunkCache struct { onDiskCacheSizeLimit0 uint64 onDiskCacheSizeLimit1 uint64 onDiskCacheSizeLimit2 uint64 - forceCache bool } var _ ChunkCache = &TieredChunkCache{} -func NewTieredChunkCache(maxEntries int64, dir string, diskSizeInUnit int64, unitSize int64, forceCache bool) *TieredChunkCache { +func NewTieredChunkCache(maxEntries int64, dir string, diskSizeInUnit int64, unitSize int64) *TieredChunkCache { c := &TieredChunkCache{ - memCache: NewChunkCacheInMemory(maxEntries), - forceCache: forceCache, + memCache: NewChunkCacheInMemory(maxEntries), } 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 8a517b486..14179beaa 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, false) + cache := NewTieredChunkCache(2, tmpDir, totalDiskSizeInKB, 1024) writeCount := 5 type test_data struct { @@ -61,7 +61,7 @@ func TestOnDisk(t *testing.T) { cache.Shutdown() - cache = NewTieredChunkCache(2, tmpDir, totalDiskSizeInKB, 1024, false) + cache = NewTieredChunkCache(2, tmpDir, totalDiskSizeInKB, 1024) for i := 0; i < 2; i++ { data := mem.Allocate(testData[i].size) |