Merge branch 'master' into support_ssd_volume

2021-02-09 11:37:07 -08:00
parent 15da5834e1 a6e8d606b4
commit 821c46edf1
212 changed files with 5765 additions and 2102 deletions
--- a/weed/filesys/wfs_write.go
+++ b/weed/filesys/wfs_write.go
@@ -54,6 +54,9 @@ func (wfs *WFS) saveDataAsChunk(fullPath util.FullPath) filer.SaveDataAsChunkFun
 		}

 		fileUrl := fmt.Sprintf("http://%s/%s", host, fileId)
+		if wfs.option.VolumeServerAccess == "filerProxy" {
+			fileUrl = fmt.Sprintf("http://%s/?proxyChunkId=%s", wfs.option.FilerAddress, fileId)
+		}
 		uploadResult, err, data := operation.Upload(fileUrl, filename, wfs.option.Cipher, reader, false, "", nil, auth)
 		if err != nil {
 			glog.V(0).Infof("upload data %v to %s: %v", filename, fileUrl, err)