diff options
| author | LHHDZ <changlin.shi@ly.com> | 2022-06-20 13:42:18 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-20 13:42:18 +0800 |
| commit | 8db9f13bc69be974fbd18c4b0aacd071ea1acaa9 (patch) | |
| tree | e84927ea360a7ede80d13fe7aada59356c0475ce /weed/filer/filechunks.go | |
| parent | 9e036df3566e842710ea2b0ed3ad28f5af2a1885 (diff) | |
| parent | 1baa7ead59a0a040d1165e3579cf79f90c20dd65 (diff) | |
| download | seaweedfs-8db9f13bc69be974fbd18c4b0aacd071ea1acaa9.tar.xz seaweedfs-8db9f13bc69be974fbd18c4b0aacd071ea1acaa9.zip | |
Merge branch 'master' into circuit_breaker
Diffstat (limited to 'weed/filer/filechunks.go')
| -rw-r--r-- | weed/filer/filechunks.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/weed/filer/filechunks.go b/weed/filer/filechunks.go index 208ef8095..48b344bf8 100644 --- a/weed/filer/filechunks.go +++ b/weed/filer/filechunks.go @@ -3,11 +3,12 @@ package filer import ( "bytes" "fmt" - "github.com/chrislusf/seaweedfs/weed/wdclient" - "golang.org/x/exp/slices" "math" "sync" + "github.com/chrislusf/seaweedfs/weed/wdclient" + "golang.org/x/exp/slices" + "github.com/chrislusf/seaweedfs/weed/pb/filer_pb" "github.com/chrislusf/seaweedfs/weed/util" ) @@ -248,6 +249,9 @@ func MergeIntoVisibles(visibles []VisibleInterval, chunk *filer_pb.FileChunk) (n func NonOverlappingVisibleIntervals(lookupFileIdFn wdclient.LookupFileIdFunctionType, chunks []*filer_pb.FileChunk, startOffset int64, stopOffset int64) (visibles []VisibleInterval, err error) { chunks, _, err = ResolveChunkManifest(lookupFileIdFn, chunks, startOffset, stopOffset) + if err != nil { + return + } visibles2 := readResolvedChunks(chunks) |