opensource/grpc-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Makes GoAway Handler no-op

Browse Source
This commit is contained in:
Gian Biondi
2015-05-04 14:52:15 -04:00
parent e1221aa9da
commit fd6bf94947
1 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
transport/http2_server.go
View File

@ -84,8 +84,6 @@ type http2Server struct {
activeStreams map[uint32]*Stream activeStreams map[uint32]*Stream
// the per-stream outbound flow control window size set by the peer. // the per-stream outbound flow control window size set by the peer.
streamSendQuota uint32 streamSendQuota uint32
// set to true when server receives GOAWAY frame
goaway bool
} }
// newHTTP2Server constructs a ServerTransport based on HTTP2. ConnectionError is // newHTTP2Server constructs a ServerTransport based on HTTP2. ConnectionError is
@ -165,12 +163,6 @@ func (t *http2Server) operateHeaders(hDec *hpackDecoder, s *Stream, frame header
return s return s
} }
t.mu.Lock() t.mu.Lock()
if t.goaway {
//Stop creating streams on this transport
log.Printf("transport: http2server received GOAWAY, rejecting new streams")
t.mu.Unlock()
return nil
}
if t.state != reachable { if t.state != reachable {
t.mu.Unlock() t.mu.Unlock()
return nil return nil
@ -290,7 +282,7 @@ func (t *http2Server) HandleStreams(handle func(*Stream)) {
case *http2.WindowUpdateFrame: case *http2.WindowUpdateFrame:
t.handleWindowUpdate(frame) t.handleWindowUpdate(frame)
case *http2.GoAwayFrame: case *http2.GoAwayFrame:
t.handleGoAway(frame) break
default: default:
log.Printf("transport: http2Server.HandleStreams found unhandled frame type %v.", frame) log.Printf("transport: http2Server.HandleStreams found unhandled frame type %v.", frame)
} }
@ -410,12 +402,6 @@ func (t *http2Server) handleWindowUpdate(f *http2.WindowUpdateFrame) {
} }
} }
func (t *http2Server) handleGoAway(f *http2.GoAwayFrame) {
t.mu.Lock()
t.goaway = true
t.mu.Unlock()
}
func (t *http2Server) writeHeaders(s *Stream, b *bytes.Buffer, endStream bool) error { func (t *http2Server) writeHeaders(s *Stream, b *bytes.Buffer, endStream bool) error {
first := true first := true
endHeaders := false endHeaders := false