diff options
| author | tnextday <fw2k4@163.com> | 2016-02-27 17:42:41 +0800 |
|---|---|---|
| committer | tnextday <fw2k4@163.com> | 2016-02-27 17:42:41 +0800 |
| commit | a98f359122f5bd9f1c86e1751a55073c3c90f31a (patch) | |
| tree | df32d4629df91d7614075afee2fe28465da8f2fe /go/topology | |
| parent | a436b0345a3400610c4bc7e8e93336c707e45571 (diff) | |
| download | seaweedfs-a98f359122f5bd9f1c86e1751a55073c3c90f31a.tar.xz seaweedfs-a98f359122f5bd9f1c86e1751a55073c3c90f31a.zip | |
Fix chunk manifest replicate upload error
Escape the redirect url in volume read handler
Diffstat (limited to 'go/topology')
| -rw-r--r-- | go/topology/store_replicate.go | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/go/topology/store_replicate.go b/go/topology/store_replicate.go index a4be4726f..89fa1f379 100644 --- a/go/topology/store_replicate.go +++ b/go/topology/store_replicate.go @@ -5,6 +5,8 @@ import ( "net/http" "strconv" + "net/url" + "github.com/chrislusf/seaweedfs/go/glog" "github.com/chrislusf/seaweedfs/go/operation" "github.com/chrislusf/seaweedfs/go/security" @@ -33,9 +35,24 @@ func ReplicatedWrite(masterNode string, s *storage.Store, } if needToReplicate { //send to other replica locations if r.FormValue("type") != "replicate" { + if !distributedOperation(masterNode, s, volumeId, func(location operation.Location) bool { - _, err := operation.Upload( - "http://"+location.Url+r.URL.Path+"?type=replicate&ts="+strconv.FormatUint(needle.LastModified, 10), + u := url.URL{ + Scheme: "http", + Host: location.Url, + Path: r.URL.Path, + } + q := url.Values{ + "type": {"replicate"}, + } + if needle.LastModified > 0 { + q.Set("ts", strconv.FormatUint(needle.LastModified, 10)) + } + if needle.IsChunkedManifest() { + q.Set("cm", "true") + } + u.RawQuery = q.Encode() + _, err := operation.Upload(u.String(), string(needle.Name), bytes.NewReader(needle.Data), needle.IsGzipped(), string(needle.Mime), jwt) return err == nil |