diff options
| author | chrislu <chris.lu@gmail.com> | 2024-02-25 08:00:37 -0800 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2024-02-25 08:00:37 -0800 |
| commit | a52ce076fc4d699f2155aa1e4e269a71c2674e92 (patch) | |
| tree | 2d6f343a3ec01588eb3c6eaf62f3dd712ce6b83c /weed/server | |
| parent | 16b4f9d9ab5897e29eab36d78ddf625a050f5a8d (diff) | |
| parent | 7187346cc1630f92c0aa4679965e4bdc0149a6d7 (diff) | |
| download | seaweedfs-a52ce076fc4d699f2155aa1e4e269a71c2674e92.tar.xz seaweedfs-a52ce076fc4d699f2155aa1e4e269a71c2674e92.zip | |
Merge branch 'master' into mq-subscribe
Diffstat (limited to 'weed/server')
| -rw-r--r-- | weed/server/filer_server_handlers_write.go | 8 | ||||
| -rw-r--r-- | weed/server/filer_server_handlers_write_autochunk.go | 2 | ||||
| -rw-r--r-- | weed/server/volume_server_handlers.go | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/weed/server/filer_server_handlers_write.go b/weed/server/filer_server_handlers_write.go index 0f82ca267..b186fd34e 100644 --- a/weed/server/filer_server_handlers_write.go +++ b/weed/server/filer_server_handlers_write.go @@ -213,14 +213,12 @@ func (fs *FilerServer) DeleteHandler(w http.ResponseWriter, r *http.Request) { err := fs.filer.DeleteEntryMetaAndData(context.Background(), util.FullPath(objectPath), isRecursive, ignoreRecursiveError, !skipChunkDeletion, false, nil) if err != nil { - glog.V(1).Infoln("deleting", objectPath, ":", err.Error()) - httpStatus := http.StatusInternalServerError if err == filer_pb.ErrNotFound { - httpStatus = http.StatusNoContent - writeJsonQuiet(w, r, httpStatus, nil) + writeJsonQuiet(w, r, http.StatusNoContent, nil) return } - writeJsonError(w, r, httpStatus, err) + glog.V(1).Infoln("deleting", objectPath, ":", err.Error()) + writeJsonError(w, r, http.StatusInternalServerError, err) return } diff --git a/weed/server/filer_server_handlers_write_autochunk.go b/weed/server/filer_server_handlers_write_autochunk.go index f1834c893..f4428be61 100644 --- a/weed/server/filer_server_handlers_write_autochunk.go +++ b/weed/server/filer_server_handlers_write_autochunk.go @@ -50,7 +50,7 @@ func (fs *FilerServer) autoChunk(ctx context.Context, w http.ResponseWriter, r * } if err != nil { if strings.HasPrefix(err.Error(), "read input:") || err.Error() == io.ErrUnexpectedEOF.Error() { - writeJsonError(w, r, 499, err) + writeJsonError(w, r, util.HttpStatusCancelled, err) } else if strings.HasSuffix(err.Error(), "is a file") || strings.HasSuffix(err.Error(), "already exists") { writeJsonError(w, r, http.StatusConflict, err) } else { diff --git a/weed/server/volume_server_handlers.go b/weed/server/volume_server_handlers.go index 06134e648..4325b0074 100644 --- a/weed/server/volume_server_handlers.go +++ b/weed/server/volume_server_handlers.go @@ -53,7 +53,7 @@ func (vs *VolumeServer) privateStoreHandler(w http.ResponseWriter, r *http.Reque select { case <-r.Context().Done(): glog.V(4).Infof("request cancelled from %s: %v", r.RemoteAddr, r.Context().Err()) - w.WriteHeader(http.StatusInternalServerError) + w.WriteHeader(util.HttpStatusCancelled) vs.inFlightDownloadDataLimitCond.L.Unlock() return default: |