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/filechunk_manifest.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/filechunk_manifest.go')
| -rw-r--r-- | weed/filer/filechunk_manifest.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/weed/filer/filechunk_manifest.go b/weed/filer/filechunk_manifest.go index 091bbee5a..4eb657dfa 100644 --- a/weed/filer/filechunk_manifest.go +++ b/weed/filer/filechunk_manifest.go @@ -3,7 +3,6 @@ package filer import ( "bytes" "fmt" - "github.com/chrislusf/seaweedfs/weed/wdclient" "io" "math" "net/url" @@ -11,6 +10,8 @@ import ( "sync" "time" + "github.com/chrislusf/seaweedfs/weed/wdclient" + "github.com/golang/protobuf/proto" "github.com/chrislusf/seaweedfs/weed/glog" @@ -63,14 +64,14 @@ func ResolveChunkManifest(lookupFileIdFn wdclient.LookupFileIdFunctionType, chun resolvedChunks, err := ResolveOneChunkManifest(lookupFileIdFn, chunk) if err != nil { - return chunks, nil, err + return dataChunks, nil, err } manifestChunks = append(manifestChunks, chunk) // recursive subDataChunks, subManifestChunks, subErr := ResolveChunkManifest(lookupFileIdFn, resolvedChunks, startOffset, stopOffset) if subErr != nil { - return chunks, nil, subErr + return dataChunks, nil, subErr } dataChunks = append(dataChunks, subDataChunks...) manifestChunks = append(manifestChunks, subManifestChunks...) |