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: a stopped stream does not accept any methods

Browse Source
This commit is contained in:
Xiang Li 2015-01-03 19:39:33 -08:00
parent 95a661251d
commit 3319f716d9
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
rafthttp/streamer.go
View File

@ -17,6 +17,7 @@
package rafthttp
import (
"errors"
"fmt"
"io"
"log"
@ -41,24 +42,27 @@ const (
// TODO: a stream might hava one stream server or one stream client, but not both.
type stream struct {
// the server might be attached asynchronously with the owner of the stream
// use a mutex to protect it
sync.Mutex
w *streamWriter
r *streamReader
w *streamWriter
r *streamReader
stopped bool
}
func (s *stream) open(from, to, cid types.ID, term uint64, tr http.RoundTripper, u string, r Raft) error {
if s.r != nil {
panic("open: stream is open")
}
c, err := newStreamReader(from, to, cid, term, tr, u, r)
if err != nil {
log.Printf("stream: error opening stream: %v", err)
return err
}
s.Lock()
defer s.Unlock()
if s.stopped {
return errors.New("stream: stopped")
}
if s.r != nil {
panic("open: stream is open")
}
s.r = c
return nil
}
@ -66,6 +70,9 @@ func (s *stream) open(from, to, cid types.ID, term uint64, tr http.RoundTripper,
func (s *stream) attach(sw *streamWriter) error {
s.Lock()
defer s.Unlock()
if s.stopped {
return errors.New("stream: stopped")
}
if s.w != nil {
// ignore lower-term streaming request
if sw.term < s.w.term {
@ -80,6 +87,9 @@ func (s *stream) attach(sw *streamWriter) error {
func (s *stream) write(m raftpb.Message) bool {
s.Lock()
defer s.Unlock()
if s.stopped {
return false
}
if s.w == nil {
return false
}
@ -105,7 +115,6 @@ func (s *stream) write(m raftpb.Message) bool {
func (s *stream) invalidate(term uint64) {
s.Lock()
defer s.Unlock()
if s.w != nil {
if s.w.term < term {
s.w.stop()
@ -118,6 +127,9 @@ func (s *stream) invalidate(term uint64) {
s.r = nil
}
}
if term == math.MaxUint64 {
s.stopped = true
}
}
func (s *stream) stop() {
@ -125,6 +137,8 @@ func (s *stream) stop() {
}
func (s *stream) isOpen() bool {
s.Lock()
defer s.Unlock()
if s.r != nil && s.r.isStopped() {
s.r = nil
}