Browse Source
fix: pass proxied query param (#7477)
* fix: pass proxied query param
* fix: use math/rand/v2
* Shuffle condition
---------
Co-authored-by: chrislu <chris.lu@gmail.com>
master
Konstantin Lebedev
2 days ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
14 additions and
2 deletions
-
weed/server/volume_server_handlers.go
-
weed/server/volume_server_handlers_read.go
|
|
|
@ -75,6 +75,10 @@ func (vs *VolumeServer) checkDownloadLimit(w http.ResponseWriter, r *http.Reques |
|
|
|
// - true: Request was handled (either proxied successfully or failed with error response)
|
|
|
|
// - false: No proxy available (volume has no replicas or request already proxied)
|
|
|
|
func (vs *VolumeServer) tryProxyToReplica(w http.ResponseWriter, r *http.Request) bool { |
|
|
|
if r.URL.Query().Get(reqIsProxied) == "true" { |
|
|
|
return false // already proxied
|
|
|
|
} |
|
|
|
|
|
|
|
vid, _, _, _, _ := parseURLPath(r.URL.Path) |
|
|
|
volumeId, err := needle.NewVolumeId(vid) |
|
|
|
if err != nil { |
|
|
|
@ -84,7 +88,7 @@ func (vs *VolumeServer) tryProxyToReplica(w http.ResponseWriter, r *http.Request |
|
|
|
} |
|
|
|
|
|
|
|
volume := vs.store.GetVolume(volumeId) |
|
|
|
if volume != nil && volume.ReplicaPlacement != nil && volume.ReplicaPlacement.HasReplication() && r.URL.Query().Get(reqIsProxied) != "true" { |
|
|
|
if volume != nil && volume.ReplicaPlacement != nil && volume.ReplicaPlacement.HasReplication() { |
|
|
|
vs.proxyReqToTargetServer(w, r) |
|
|
|
return true // handled by proxy
|
|
|
|
} |
|
|
|
|
|
|
|
@ -7,6 +7,7 @@ import ( |
|
|
|
"errors" |
|
|
|
"fmt" |
|
|
|
"io" |
|
|
|
"math/rand/v2" |
|
|
|
"mime" |
|
|
|
"net/http" |
|
|
|
"net/url" |
|
|
|
@ -59,6 +60,11 @@ func (vs *VolumeServer) proxyReqToTargetServer(w http.ResponseWriter, r *http.Re |
|
|
|
NotFound(w) |
|
|
|
return |
|
|
|
} |
|
|
|
if len(lookupResult.Locations) >= 2 { |
|
|
|
rand.Shuffle(len(lookupResult.Locations), func(i, j int) { |
|
|
|
lookupResult.Locations[i], lookupResult.Locations[j] = lookupResult.Locations[j], lookupResult.Locations[i] |
|
|
|
}) |
|
|
|
} |
|
|
|
var tragetUrl *url.URL |
|
|
|
location := fmt.Sprintf("%s:%d", vs.store.Ip, vs.store.Port) |
|
|
|
for _, loc := range lookupResult.Locations { |
|
|
|
@ -79,7 +85,9 @@ func (vs *VolumeServer) proxyReqToTargetServer(w http.ResponseWriter, r *http.Re |
|
|
|
// proxy client request to target server
|
|
|
|
r.URL.Host = tragetUrl.Host |
|
|
|
r.URL.Scheme = tragetUrl.Scheme |
|
|
|
r.URL.Query().Add(reqIsProxied, "true") |
|
|
|
query := r.URL.Query() |
|
|
|
query.Set(reqIsProxied, "true") |
|
|
|
r.URL.RawQuery = query.Encode() |
|
|
|
request, err := http.NewRequest(http.MethodGet, r.URL.String(), nil) |
|
|
|
if err != nil { |
|
|
|
glog.V(0).Infof("failed to instance http request of url %s: %v", r.URL.String(), err) |
|
|
|
|