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

small fix

Browse Source
This commit is contained in:
iamqizhao
2015-04-03 16:46:27 -07:00
parent 51bc46aaf8
commit fba61d1bde
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
transport/http2_client.go
View File

@ -505,7 +505,7 @@ func (t *http2Client) handleData(f *http2.DataFrame) {
return return
} }
s.state = streamDone s.state = streamDone
s.statusCode = codes.ResourceExhausted s.statusCode = codes.Internal
s.statusDesc = err.Error() s.statusDesc = err.Error()
s.mu.Unlock() s.mu.Unlock()
s.write(recvMsg{err: io.EOF}) s.write(recvMsg{err: io.EOF})

9
transport/transport_test.go
View File

@ -453,21 +453,22 @@ func TestServerWithMisbehavedClient(t *testing.T) {
t.Fatalf("Failed to write data: ", err) t.Fatalf("Failed to write data: ", err)
} }
cc.writableChan <- 0 cc.writableChan <- 0
sent += http2MaxFrameLen
// Wait until the server creates the corresponding stream. // Wait until the server creates the corresponding stream.
var ss *Stream
for { for {
time.Sleep(time.Millisecond) time.Sleep(time.Millisecond)
sc.mu.Lock() sc.mu.Lock()
if len(sc.activeStreams) > 0 { if len(sc.activeStreams) > 0 {
ss = sc.activeStreams[s.id]
sc.mu.Unlock() sc.mu.Unlock()
break break
} }
sc.mu.Unlock() sc.mu.Unlock()
} }
ss := sc.activeStreams[s.id]
if ss.fc.pendingData != http2MaxFrameLen || ss.fc.pendingUpdate != 0 || sc.fc.pendingData != http2MaxFrameLen || sc.fc.pendingUpdate != 0 { if ss.fc.pendingData != http2MaxFrameLen || ss.fc.pendingUpdate != 0 || sc.fc.pendingData != http2MaxFrameLen || sc.fc.pendingUpdate != 0 {
t.Fatalf("Server mistakenly updates inbound flow control params: got %d, %d, %d, %d; want %d, %d, %d, %d", ss.fc.pendingData, ss.fc.pendingUpdate, sc.fc.pendingData, sc.fc.pendingUpdate, http2MaxFrameLen, 0, http2MaxFrameLen, 0) t.Fatalf("Server mistakenly updates inbound flow control params: got %d, %d, %d, %d; want %d, %d, %d, %d", ss.fc.pendingData, ss.fc.pendingUpdate, sc.fc.pendingData, sc.fc.pendingUpdate, http2MaxFrameLen, 0, http2MaxFrameLen, 0)
} }
sent += http2MaxFrameLen
// Keep sending until the server inbound window is drained for that stream. // Keep sending until the server inbound window is drained for that stream.
for sent <= initialWindowSize { for sent <= initialWindowSize {
<-cc.writableChan <-cc.writableChan
@ -536,8 +537,8 @@ func TestClientWithMisbehavedServer(t *testing.T) {
if s.fc.pendingData != initialWindowSize || s.fc.pendingUpdate != 0 || conn.fc.pendingData != initialWindowSize || conn.fc.pendingUpdate != 0 { if s.fc.pendingData != initialWindowSize || s.fc.pendingUpdate != 0 || conn.fc.pendingData != initialWindowSize || conn.fc.pendingUpdate != 0 {
t.Fatalf("Client mistakenly updates inbound flow control params: got %d, %d, %d, %d; want %d, %d, %d, %d", s.fc.pendingData, s.fc.pendingUpdate, conn.fc.pendingData, conn.fc.pendingUpdate, initialWindowSize, 0, initialWindowSize, 0) t.Fatalf("Client mistakenly updates inbound flow control params: got %d, %d, %d, %d; want %d, %d, %d, %d", s.fc.pendingData, s.fc.pendingUpdate, conn.fc.pendingData, conn.fc.pendingUpdate, initialWindowSize, 0, initialWindowSize, 0)
} }
if err != io.EOF || s.statusCode != codes.ResourceExhausted { if err != io.EOF || s.statusCode != codes.Internal {
t.Fatalf("Got err %v and the status code %d, want <EOF> and the code %d", err, s.statusCode, codes.ResourceExhausted) t.Fatalf("Got err %v and the status code %d, want <EOF> and the code %d", err, s.statusCode, codes.Internal)
} }
conn.CloseStream(s, err) conn.CloseStream(s, err)
if s.fc.pendingData != 0 || s.fc.pendingUpdate != 0 || conn.fc.pendingData != 0 || conn.fc.pendingUpdate != 0 { if s.fc.pendingData != 0 || s.fc.pendingUpdate != 0 || conn.fc.pendingData != 0 || conn.fc.pendingUpdate != 0 {