diff options
| author | chrislu <chris.lu@gmail.com> | 2022-09-16 23:54:39 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2022-09-16 23:54:39 -0700 |
| commit | 3fc261d27c90fc06c1d555dd998d7535b844a746 (patch) | |
| tree | b17d0f9af6a7e8812e40d2e4aae3f3afaef373b3 /weed/server | |
| parent | 06748f27714d51235ec8c9b41f91eb6f0545130e (diff) | |
| parent | 5d87ad72d8ee90146d2f6b619d54c6ac0ba4b868 (diff) | |
| download | seaweedfs-3fc261d27c90fc06c1d555dd998d7535b844a746.tar.xz seaweedfs-3fc261d27c90fc06c1d555dd998d7535b844a746.zip | |
Merge branch 'master' of https://github.com/seaweedfs/seaweedfs
Diffstat (limited to 'weed/server')
| -rw-r--r-- | weed/server/filer_server_handlers_write.go | 2 | ||||
| -rw-r--r-- | weed/server/volume_server.go | 3 | ||||
| -rw-r--r-- | weed/server/volume_server_handlers_read.go | 5 |
3 files changed, 8 insertions, 2 deletions
diff --git a/weed/server/filer_server_handlers_write.go b/weed/server/filer_server_handlers_write.go index fc767dd9e..d2c296fad 100644 --- a/weed/server/filer_server_handlers_write.go +++ b/weed/server/filer_server_handlers_write.go @@ -195,6 +195,8 @@ func (fs *FilerServer) DeleteHandler(w http.ResponseWriter, r *http.Request) { httpStatus := http.StatusInternalServerError if err == filer_pb.ErrNotFound { httpStatus = http.StatusNoContent + writeJsonQuiet(w, r, httpStatus, nil) + return } writeJsonError(w, r, httpStatus, err) return diff --git a/weed/server/volume_server.go b/weed/server/volume_server.go index 8bf50ce45..07bb0b9ee 100644 --- a/weed/server/volume_server.go +++ b/weed/server/volume_server.go @@ -29,6 +29,7 @@ type VolumeServer struct { inFlightDownloadDataLimitCond *sync.Cond inflightUploadDataTimeout time.Duration hasSlowRead bool + readBufferSize int SeedMasterNodes []pb.ServerAddress currentMaster pb.ServerAddress @@ -66,6 +67,7 @@ func NewVolumeServer(adminMux, publicMux *http.ServeMux, ip string, concurrentDownloadLimit int64, inflightUploadDataTimeout time.Duration, hasSlowRead bool, + readBufferSize int, ) *VolumeServer { v := util.GetViper() @@ -96,6 +98,7 @@ func NewVolumeServer(adminMux, publicMux *http.ServeMux, ip string, concurrentDownloadLimit: concurrentDownloadLimit, inflightUploadDataTimeout: inflightUploadDataTimeout, hasSlowRead: hasSlowRead, + readBufferSize: readBufferSize, } vs.SeedMasterNodes = masterNodes diff --git a/weed/server/volume_server_handlers_read.go b/weed/server/volume_server_handlers_read.go index b8f4120a6..facdf2556 100644 --- a/weed/server/volume_server_handlers_read.go +++ b/weed/server/volume_server_handlers_read.go @@ -116,8 +116,9 @@ func (vs *VolumeServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request) cookie := n.Cookie readOption := &storage.ReadOption{ - ReadDeleted: r.FormValue("readDeleted") == "true", - HasSlowRead: vs.hasSlowRead, + ReadDeleted: r.FormValue("readDeleted") == "true", + HasSlowRead: vs.hasSlowRead, + ReadBufferSize: vs.readBufferSize, } var count int |