1 files changed, 45 insertions, 25 deletions

diff --git a/weed/util/chunk_cache/chunk_cache.go b/weed/util/chunk_cache/chunk_cache.go
index e1d4b639f..3615aee0e 100644
--- a/weed/util/chunk_cache/chunk_cache.go
+++ b/weed/util/chunk_cache/chunk_cache.go
@@ -7,33 +7,38 @@ import (
 	"github.com/chrislusf/seaweedfs/weed/storage/needle"
 )
 
-const (
-	memCacheSizeLimit     = 1024 * 1024
-	onDiskCacheSizeLimit0 = memCacheSizeLimit
-	onDiskCacheSizeLimit1 = 4 * memCacheSizeLimit
-)
+type ChunkCache interface {
+	GetChunk(fileId string, minSize uint64) (data []byte)
+	SetChunk(fileId string, data []byte)
+}
 
 // a global cache for recently accessed file chunks
-type ChunkCache struct {
+type TieredChunkCache struct {
 	memCache   *ChunkCacheInMemory
 	diskCaches []*OnDiskCacheLayer
 	sync.RWMutex
+	onDiskCacheSizeLimit0 uint64
+	onDiskCacheSizeLimit1 uint64
+	onDiskCacheSizeLimit2 uint64
 }
 
-func NewChunkCache(maxEntries int64, dir string, diskSizeMB int64) *ChunkCache {
+func NewTieredChunkCache(maxEntries int64, dir string, diskSizeInUnit int64, unitSize int64) *TieredChunkCache {
 
-	c := &ChunkCache{
+	c := &TieredChunkCache{
 		memCache: NewChunkCacheInMemory(maxEntries),
 	}
 	c.diskCaches = make([]*OnDiskCacheLayer, 3)
-	c.diskCaches[0] = NewOnDiskCacheLayer(dir, "c0_1", diskSizeMB/4, 4)
-	c.diskCaches[1] = NewOnDiskCacheLayer(dir, "c1_4", diskSizeMB/4, 4)
-	c.diskCaches[2] = NewOnDiskCacheLayer(dir, "cache", diskSizeMB/2, 4)
+	c.onDiskCacheSizeLimit0 = uint64(unitSize)
+	c.onDiskCacheSizeLimit1 = 4 * c.onDiskCacheSizeLimit0
+	c.onDiskCacheSizeLimit2 = 2 * c.onDiskCacheSizeLimit1
+	c.diskCaches[0] = NewOnDiskCacheLayer(dir, "c0_2", diskSizeInUnit*unitSize/8, 2)
+	c.diskCaches[1] = NewOnDiskCacheLayer(dir, "c1_3", diskSizeInUnit*unitSize/4+diskSizeInUnit*unitSize/8, 3)
+	c.diskCaches[2] = NewOnDiskCacheLayer(dir, "c2_2", diskSizeInUnit*unitSize/2, 2)
 
 	return c
 }
 
-func (c *ChunkCache) GetChunk(fileId string, chunkSize uint64) (data []byte) {
+func (c *TieredChunkCache) GetChunk(fileId string, minSize uint64) (data []byte) {
 	if c == nil {
 		return
 	}
@@ -41,13 +46,14 @@ func (c *ChunkCache) GetChunk(fileId string, chunkSize uint64) (data []byte) {
 	c.RLock()
 	defer c.RUnlock()
 
-	return c.doGetChunk(fileId, chunkSize)
+	return c.doGetChunk(fileId, minSize)
 }
 
-func (c *ChunkCache) doGetChunk(fileId string, chunkSize uint64) (data []byte) {
+func (c *TieredChunkCache) doGetChunk(fileId string, minSize uint64) (data []byte) {
 
-	if chunkSize < memCacheSizeLimit {
-		if data = c.memCache.GetChunk(fileId); data != nil {
+	if minSize <= c.onDiskCacheSizeLimit0 {
+		data = c.memCache.GetChunk(fileId)
+		if len(data) >= int(minSize) {
 			return data
 		}
 	}
@@ -58,9 +64,21 @@ func (c *ChunkCache) doGetChunk(fileId string, chunkSize uint64) (data []byte) {
 		return nil
 	}
 
-	for _, diskCache := range c.diskCaches {
-		data := diskCache.getChunk(fid.Key)
-		if len(data) != 0 {
+	if minSize <= c.onDiskCacheSizeLimit0 {
+		data = c.diskCaches[0].getChunk(fid.Key)
+		if len(data) >= int(minSize) {
+			return data
+		}
+	}
+	if minSize <= c.onDiskCacheSizeLimit1 {
+		data = c.diskCaches[1].getChunk(fid.Key)
+		if len(data) >= int(minSize) {
+			return data
+		}
+	}
+	{
+		data = c.diskCaches[2].getChunk(fid.Key)
+		if len(data) >= int(minSize) {
 			return data
 		}
 	}
@@ -69,19 +87,21 @@ func (c *ChunkCache) doGetChunk(fileId string, chunkSize uint64) (data []byte) {
 
 }
 
-func (c *ChunkCache) SetChunk(fileId string, data []byte) {
+func (c *TieredChunkCache) SetChunk(fileId string, data []byte) {
 	if c == nil {
 		return
 	}
 	c.Lock()
 	defer c.Unlock()
 
+	glog.V(4).Infof("SetChunk %s size %d\n", fileId, len(data))
+
 	c.doSetChunk(fileId, data)
 }
 
-func (c *ChunkCache) doSetChunk(fileId string, data []byte) {
+func (c *TieredChunkCache) doSetChunk(fileId string, data []byte) {
 
-	if len(data) < memCacheSizeLimit {
+	if len(data) <= int(c.onDiskCacheSizeLimit0) {
 		c.memCache.SetChunk(fileId, data)
 	}
 
@@ -91,9 +111,9 @@ func (c *ChunkCache) doSetChunk(fileId string, data []byte) {
 		return
 	}
 
-	if len(data) < onDiskCacheSizeLimit0 {
+	if len(data) <= int(c.onDiskCacheSizeLimit0) {
 		c.diskCaches[0].setChunk(fid.Key, data)
-	} else if len(data) < onDiskCacheSizeLimit1 {
+	} else if len(data) <= int(c.onDiskCacheSizeLimit1) {
 		c.diskCaches[1].setChunk(fid.Key, data)
 	} else {
 		c.diskCaches[2].setChunk(fid.Key, data)
@@ -101,7 +121,7 @@ func (c *ChunkCache) doSetChunk(fileId string, data []byte) {
 
 }
 
-func (c *ChunkCache) Shutdown() {
+func (c *TieredChunkCache) Shutdown() {
 	if c == nil {
 		return
 	}