gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

volume: support http status 304 for the same file id

Browse Source
This commit is contained in:
Chris Lu
2019-04-21 13:33:23 -07:00
parent ebe94be1a1
commit 440111a349
6 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
weed/topology/store_replicate.go
View File

@@ -20,19 +20,18 @@ import (
func ReplicatedWrite(masterNode string, s *storage.Store,
volumeId needle.VolumeId, n *needle.Needle,
r *http.Request) (size uint32, errorStatus string) {
r *http.Request) (size uint32, isUnchanged bool, err error) {
//check JWT
jwt := security.GetJwt(r)
ret, err := s.Write(volumeId, n)
needToReplicate := !s.HasVolume(volumeId)
size, isUnchanged, err = s.Write(volumeId, n)
if err != nil {
errorStatus = "Failed to write to local disk (" + err.Error() + ")"
size = ret
err = fmt.Errorf("failed to write to local disk: %v", err)
return
}
needToReplicate := !s.HasVolume(volumeId)
needToReplicate = needToReplicate || s.GetVolume(volumeId).NeedToReplicate()
if !needToReplicate {
needToReplicate = s.GetVolume(volumeId).NeedToReplicate()
@@ -75,12 +74,11 @@ func ReplicatedWrite(masterNode string, s *storage.Store,
pairMap, jwt)
return err
}); err != nil {
ret = 0
errorStatus = fmt.Sprintf("Failed to write to replicas for volume %d: %v", volumeId, err)
size = 0
err = fmt.Errorf("failed to write to replicas for volume %d: %v", volumeId, err)
}
}
}
size = ret
return
}