Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

rafthttp: add remote in pipeline and snapshot handler when corresponding peer or remote do not exist

Browse Source 
Fixes: #8506
This commit is contained in:
blueblue 2017-09-07 10:14:54 +08:00
parent 3c1845604b
commit a0361ea3f9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rafthttp/http.go
View File

@ -91,7 +91,7 @@ func (h *pipelineHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
return return
} }
if from, err := types.IDFromString(r.Header.Get("X-Server-From")); err != nil { if from, err := types.IDFromString(r.Header.Get("X-Server-From")); err == nil {
if urls := r.Header.Get("X-PeerURLs"); urls != "" { if urls := r.Header.Get("X-PeerURLs"); urls != "" {
h.tr.AddRemote(from, strings.Split(urls, ",")) h.tr.AddRemote(from, strings.Split(urls, ","))
} }
@ -176,7 +176,7 @@ func (h *snapshotHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
return return
} }
if from, err := types.IDFromString(r.Header.Get("X-Server-From")); err != nil { if from, err := types.IDFromString(r.Header.Get("X-Server-From")); err == nil {
if urls := r.Header.Get("X-PeerURLs"); urls != "" { if urls := r.Header.Get("X-PeerURLs"); urls != "" {
h.tr.AddRemote(from, strings.Split(urls, ",")) h.tr.AddRemote(from, strings.Split(urls, ","))
} }