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

transport: fix race between operateHeaders and closeStream and reading headers (#3062)

Browse Source 
headerChan isn't necessarily closed when closeStream returns; block on it in
waitOnHeader.
This commit is contained in:
Doug Fawley
2019-10-02 09:59:28 -07:00
committed by GitHub
parent 7aa94b7eef
commit 5df282efcf
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
internal/transport/transport.go
View File

@ -320,6 +320,9 @@ func (s *Stream) waitOnHeader() {
// this function returns. // this function returns.
err := ContextErr(s.ctx.Err()) err := ContextErr(s.ctx.Err())
s.ct.closeStream(s, err, false, 0, status.Convert(err), nil, false) s.ct.closeStream(s, err, false, 0, status.Convert(err), nil, false)
// headerChan could possibly not be closed yet if closeStream raced
// with operateHeaders; wait until it is closed explicitly here.
<-s.headerChan
case <-s.headerChan: case <-s.headerChan:
} }
} }