diff options
| author | chrislu <chris.lu@gmail.com> | 2023-05-29 16:45:28 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2023-05-29 16:45:28 -0700 |
| commit | 68c3cf767c81bda1375f169fe89bef78059de4bf (patch) | |
| tree | bc95319267971a538217ad2d6e16d89caaf5ec1b /weed | |
| parent | d1d1757520ea7a333718504c4e91a9a5ad1d39e8 (diff) | |
| parent | af0727ae4b358451e6f4e6a3887c5b6220596888 (diff) | |
| download | seaweedfs-68c3cf767c81bda1375f169fe89bef78059de4bf.tar.xz seaweedfs-68c3cf767c81bda1375f169fe89bef78059de4bf.zip | |
Merge branch 'master' of https://github.com/seaweedfs/seaweedfs
Diffstat (limited to 'weed')
| -rw-r--r-- | weed/server/filer_server_handlers_read.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/weed/server/filer_server_handlers_read.go b/weed/server/filer_server_handlers_read.go index c023dbe88..3a86c265b 100644 --- a/weed/server/filer_server_handlers_read.go +++ b/weed/server/filer_server_handlers_read.go @@ -4,8 +4,6 @@ import ( "bytes" "context" "fmt" - "github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants" - "github.com/seaweedfs/seaweedfs/weed/util/mem" "io" "math" "mime" @@ -15,6 +13,9 @@ import ( "strings" "time" + "github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants" + "github.com/seaweedfs/seaweedfs/weed/util/mem" + "github.com/seaweedfs/seaweedfs/weed/filer" "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/images" @@ -139,6 +140,7 @@ func (fs *FilerServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request) entry.GetChunks(), 0, math.MaxInt64); err != nil { err = fmt.Errorf("failed to resolve chunk manifest, err: %s", err.Error()) writeJsonError(w, r, http.StatusInternalServerError, err) + return } } writeJsonQuiet(w, r, http.StatusOK, entry) |