diff options
Diffstat (limited to 'weed/filer')
| -rw-r--r-- | weed/filer/reader_at.go | 5 | ||||
| -rw-r--r-- | weed/filer/reader_cache.go | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/weed/filer/reader_at.go b/weed/filer/reader_at.go index d475e6e11..3d9f50d0e 100644 --- a/weed/filer/reader_at.go +++ b/weed/filer/reader_at.go @@ -19,6 +19,7 @@ type ChunkReadAt struct { fileSize int64 readerCache *ReaderCache readerPattern *ReaderPattern + forceCache bool lastChunkFid string } @@ -196,7 +197,9 @@ func (c *ChunkReadAt) readChunkSliceAt(buffer []byte, chunkView *ChunkView, next if n > 0 { return n, err } - return fetchChunkRange(buffer, c.readerCache.lookupFileIdFn, chunkView.FileId, chunkView.CipherKey, chunkView.IsGzipped, int64(offset)) + if !c.forceCache { + return fetchChunkRange(buffer, c.readerCache.lookupFileIdFn, chunkView.FileId, chunkView.CipherKey, chunkView.IsGzipped, int64(offset)) + } } n, err = c.readerCache.ReadChunkAt(buffer, chunkView.FileId, chunkView.CipherKey, chunkView.IsGzipped, int64(offset), int(chunkView.ChunkSize), chunkView.ViewOffset == 0) diff --git a/weed/filer/reader_cache.go b/weed/filer/reader_cache.go index fea2bbc89..a3df8e0bd 100644 --- a/weed/filer/reader_cache.go +++ b/weed/filer/reader_cache.go @@ -7,9 +7,9 @@ import ( "time" "github.com/seaweedfs/seaweedfs/weed/util/chunk_cache" + util_http "github.com/seaweedfs/seaweedfs/weed/util/http" "github.com/seaweedfs/seaweedfs/weed/util/mem" "github.com/seaweedfs/seaweedfs/weed/wdclient" - util_http "github.com/seaweedfs/seaweedfs/weed/util/http" ) type ReaderCache struct { @@ -69,7 +69,7 @@ func (rc *ReaderCache) MaybeCache(chunkViews *Interval[*ChunkView]) { // glog.V(4).Infof("prefetch %s offset %d", chunkView.FileId, chunkView.ViewOffset) // cache this chunk if not yet - cacher := newSingleChunkCacher(rc, chunkView.FileId, chunkView.CipherKey, chunkView.IsGzipped, int(chunkView.ChunkSize), false) + cacher := newSingleChunkCacher(rc, chunkView.FileId, chunkView.CipherKey, chunkView.IsGzipped, int(chunkView.ChunkSize), chunkView.ViewOffset == 0) go cacher.startCaching() <-cacher.cacheStartedCh rc.downloaders[chunkView.FileId] = cacher |