diff options
| author | Chris Lu <chrislusf@users.noreply.github.com> | 2022-06-19 10:43:52 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-19 10:43:52 -0700 |
| commit | 1baa7ead59a0a040d1165e3579cf79f90c20dd65 (patch) | |
| tree | c71effb8118ccd9d74f2477ad0bcb53fb9de4782 /weed/filer/filechunk_manifest.go | |
| parent | d28f8bb88fcc016a51cfb52caea62fb271720747 (diff) | |
| parent | fdacd94af57a0b9040a396154e7c322bc56dd16e (diff) | |
| download | seaweedfs-1baa7ead59a0a040d1165e3579cf79f90c20dd65.tar.xz seaweedfs-1baa7ead59a0a040d1165e3579cf79f90c20dd65.zip | |
Merge pull request #3195 from geekboood/master
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...) |