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: use /raft/stream for MsgApp stream

Browse Source 
New rafthttp uses /raft/stream/msgapp for MsgApp stream, but v2.0 rafthttp
cannot understand it. Use the old endpoint /raft/stream instead for backward
compatibility, and plan to move to new endpoint in the version after the
next one.
This commit is contained in:
Yicheng Qin 2015-02-23 10:16:31 -08:00
parent 758ff26dd8
commit eeaf12beb1
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rafthttp/stream.go
View File

@ -314,7 +314,15 @@ func (cr *streamReader) roundtrip() (io.ReadCloser, error) {
if err != nil { if err != nil {
return nil, fmt.Errorf("parse url %s error: %v", u, err) return nil, fmt.Errorf("parse url %s error: %v", u, err)
} }
uu.Path = path.Join(RaftStreamPrefix, string(cr.t), cr.from.String()) switch cr.t {
case streamTypeMsgApp:
// for backward compatibility of v2.0
uu.Path = path.Join(RaftStreamPrefix, cr.from.String())
case streamTypeMessage:
uu.Path = path.Join(RaftStreamPrefix, string(streamTypeMessage), cr.from.String())
default:
log.Panicf("rafthttp: unhandled stream type %v", cr.t)
}
req, err := http.NewRequest("GET", uu.String(), nil) req, err := http.NewRequest("GET", uu.String(), nil)
if err != nil { if err != nil {
return nil, fmt.Errorf("new request to %s error: %v", u, err) return nil, fmt.Errorf("new request to %s error: %v", u, err)