From 31fc7bb2e1fa6085e0d9f3309e8ec54641e1f70c Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Sun, 27 Sep 2020 10:41:29 -0700 Subject: refactor adjust for faster test --- weed/util/chunk_cache/on_disk_cache_layer.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'weed/util/chunk_cache/on_disk_cache_layer.go') diff --git a/weed/util/chunk_cache/on_disk_cache_layer.go b/weed/util/chunk_cache/on_disk_cache_layer.go index c3192b548..a4d786510 100644 --- a/weed/util/chunk_cache/on_disk_cache_layer.go +++ b/weed/util/chunk_cache/on_disk_cache_layer.go @@ -14,11 +14,11 @@ type OnDiskCacheLayer struct { diskCaches []*ChunkCacheVolume } -func NewOnDiskCacheLayer(dir, namePrefix string, diskSizeMB int64, segmentCount int) *OnDiskCacheLayer { +func NewOnDiskCacheLayer(dir, namePrefix string, diskSize int64, segmentCount int) *OnDiskCacheLayer { - volumeCount, volumeSize := int(diskSizeMB/30000), int64(30000) + volumeCount, volumeSize := int(diskSize/(30000*1024*1024)), int64(30000*1024*1024) if volumeCount < segmentCount { - volumeCount, volumeSize = segmentCount, diskSizeMB/int64(segmentCount) + volumeCount, volumeSize = segmentCount, diskSize/int64(segmentCount) } c := &OnDiskCacheLayer{} -- cgit v1.2.3 From e43d86c79600ee09ef9bc5b271758bea662c0ca9 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Sun, 27 Sep 2020 10:58:19 -0700 Subject: fix pre allocated volume size --- weed/util/chunk_cache/on_disk_cache_layer.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'weed/util/chunk_cache/on_disk_cache_layer.go') diff --git a/weed/util/chunk_cache/on_disk_cache_layer.go b/weed/util/chunk_cache/on_disk_cache_layer.go index a4d786510..eebd89798 100644 --- a/weed/util/chunk_cache/on_disk_cache_layer.go +++ b/weed/util/chunk_cache/on_disk_cache_layer.go @@ -24,7 +24,7 @@ func NewOnDiskCacheLayer(dir, namePrefix string, diskSize int64, segmentCount in c := &OnDiskCacheLayer{} for i := 0; i < volumeCount; i++ { fileName := path.Join(dir, fmt.Sprintf("%s_%d", namePrefix, i)) - diskCache, err := LoadOrCreateChunkCacheVolume(fileName, volumeSize*1024*1024) + diskCache, err := LoadOrCreateChunkCacheVolume(fileName, volumeSize) if err != nil { glog.Errorf("failed to add cache %s : %v", fileName, err) } else { -- cgit v1.2.3