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: clean up reader when failed

Browse Source
This commit is contained in:
Xiang Li 2015-01-05 12:04:25 -08:00
parent 4938e6bff5
commit 1aa8f1eee6
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rafthttp/streamer.go
View File

@ -49,7 +49,7 @@ type stream struct {
} }
func (s *stream) open(from, to, cid types.ID, term uint64, tr http.RoundTripper, u string, r Raft) error { func (s *stream) open(from, to, cid types.ID, term uint64, tr http.RoundTripper, u string, r Raft) error {
c, err := newStreamReader(from, to, cid, term, tr, u, r) rd, err := newStreamReader(from, to, cid, term, tr, u, r)
if err != nil { if err != nil {
log.Printf("stream: error opening stream: %v", err) log.Printf("stream: error opening stream: %v", err)
return err return err
@ -58,12 +58,13 @@ func (s *stream) open(from, to, cid types.ID, term uint64, tr http.RoundTripper,
s.Lock() s.Lock()
defer s.Unlock() defer s.Unlock()
if s.stopped { if s.stopped {
rd.stop()
return errors.New("stream: stopped") return errors.New("stream: stopped")
} }
if s.r != nil { if s.r != nil {
panic("open: stream is open") panic("open: stream is open")
} }
s.r = c s.r = rd
return nil return nil
} }