diff options
| author | chrislu <chris.lu@gmail.com> | 2022-06-20 13:18:11 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2022-06-20 13:18:11 -0700 |
| commit | bf5a5abfb1925ee981306d8e49bc52bcded2279b (patch) | |
| tree | 3aa2d7aef0639134219c323a67f81ca93642ab29 /weed/filer/filechunks.go | |
| parent | 69a2e503ab51b3350388525fa778cb0b20cc82ac (diff) | |
| parent | 0d22877df9177aa51b495314b138d7a9e75eb4a2 (diff) | |
| download | seaweedfs-bf5a5abfb1925ee981306d8e49bc52bcded2279b.tar.xz seaweedfs-bf5a5abfb1925ee981306d8e49bc52bcded2279b.zip | |
Merge branch 'master' of https://github.com/chrislusf/seaweedfs
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) |