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

Reset ping strike counter right before sending out data. (#1905)

Browse Source 
Eliminate race which causes a ping to be scheduled between pingStrike counter being reset and data being scheduled.
This commit is contained in:
mmukhi
2018-03-12 09:09:31 -07:00
committed by dfawley
parent 90dca43332
commit 3a9e1bab62
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
transport/http2_server.go
View File

@ -896,9 +896,6 @@ func (t *http2Server) Write(s *Stream, hdr []byte, data []byte, opts *Options) e
// ltq is only a soft limit. // ltq is only a soft limit.
streamQuota -= size streamQuota -= size
p := r[:size] p := r[:size]
// Reset ping strikes when sending data since this might cause
// the peer to send ping.
atomic.StoreUint32(&t.resetPingStrikes, 1)
success := func() { success := func() {
ltq := ltq ltq := ltq
t.controlBuf.put(&dataFrame{streamID: s.id, endStream: false, d: p, f: func() { t.controlBuf.put(&dataFrame{streamID: s.id, endStream: false, d: p, f: func() {
@ -1013,6 +1010,9 @@ var goAwayPing = &ping{data: [8]byte{1, 6, 1, 8, 0, 3, 3, 9}}
func (t *http2Server) itemHandler(i item) error { func (t *http2Server) itemHandler(i item) error {
switch i := i.(type) { switch i := i.(type) {
case *dataFrame: case *dataFrame:
// Reset ping strikes when sending data since this might cause
// the peer to send ping.
atomic.StoreUint32(&t.resetPingStrikes, 1)
if err := t.framer.fr.WriteData(i.streamID, i.endStream, i.d); err != nil { if err := t.framer.fr.WriteData(i.streamID, i.endStream, i.d); err != nil {
return err return err
} }