diff options
| author | Chris Lu <chris.lu@gmail.com> | 2019-04-21 13:33:23 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2019-04-21 13:33:23 -0700 |
| commit | 440111a3496319b167c91dea03758eb2ada013c9 (patch) | |
| tree | 03963774e077b8235d751c226b5b2ddaf3f31d00 /weed/server | |
| parent | ebe94be1a17986a3ffa4c78e48964dd8d6a731b3 (diff) | |
| download | seaweedfs-440111a3496319b167c91dea03758eb2ada013c9.tar.xz seaweedfs-440111a3496319b167c91dea03758eb2ada013c9.zip | |
volume: support http status 304 for the same file id
Diffstat (limited to 'weed/server')
| -rw-r--r-- | weed/server/volume_grpc_tail.go | 2 | ||||
| -rw-r--r-- | weed/server/volume_server_handlers_write.go | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/weed/server/volume_grpc_tail.go b/weed/server/volume_grpc_tail.go index 820c28a1d..667131e9f 100644 --- a/weed/server/volume_grpc_tail.go +++ b/weed/server/volume_grpc_tail.go @@ -111,7 +111,7 @@ func (vs *VolumeServer) VolumeTailReceiver(ctx context.Context, req *volume_serv defer glog.V(1).Infof("receive tailing volume %d finished", v.Id) return resp, operation.TailVolumeFromSource(req.SourceVolumeServer, vs.grpcDialOption, v.Id, req.SinceNs, int(req.IdleTimeoutSeconds), func(n *needle.Needle) error { - _, err := vs.store.Write(v.Id, n) + _, _, err := vs.store.Write(v.Id, n) return err }) diff --git a/weed/server/volume_server_handlers_write.go b/weed/server/volume_server_handlers_write.go index 45c868c33..188d88ddf 100644 --- a/weed/server/volume_server_handlers_write.go +++ b/weed/server/volume_server_handlers_write.go @@ -41,11 +41,14 @@ func (vs *VolumeServer) PostHandler(w http.ResponseWriter, r *http.Request) { } ret := operation.UploadResult{} - _, errorStatus := topology.ReplicatedWrite(vs.GetMaster(), vs.store, volumeId, needle, r) + _, isUnchanged, writeError := topology.ReplicatedWrite(vs.GetMaster(), vs.store, volumeId, needle, r) httpStatus := http.StatusCreated - if errorStatus != "" { + if isUnchanged { + httpStatus = http.StatusNotModified + } + if writeError != nil { httpStatus = http.StatusInternalServerError - ret.Error = errorStatus + ret.Error = writeError.Error() } if needle.HasName() { ret.Name = string(needle.Name) |