transport/server: fix race between writing status and header #2074
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced May 18, 2018
dfawley
reviewed
May 18, 2018
transport/transport.go
Outdated
| @@ -185,13 +185,17 @@ type Stream struct { | |||
|
|
|||
| headerChan chan struct{} // closed to indicate the end of header metadata. | |||
| headerDone uint32 // set when headerChan is closed. Used to avoid closing headerChan multiple times. | |||
| header metadata.MD // the received header metadata. | |||
| trailer metadata.MD // the key-value map of trailer metadata. | |||
| // hdrMu protects header and trailer metadata on the server-side. | |||
There was a problem hiding this comment.
Please add a blank line above this to set it off from the above fields.
transport/transport.go
Outdated
|
|
||
| headerOk bool // becomes true from the first header is about to send | ||
| state streamState | ||
| // On the server-side, headerOK is atomically set to 1 when the headers are sent out. |
transport/transport.go
Outdated
|
|
||
| status *status.Status // the status error received from the server | ||
| // On client-side it is the status error received from the server. |
There was a problem hiding this comment.
Yeah, it is unused. Not sure if you're suggesting that I add it or merely asking?
There was a problem hiding this comment.
I was asking, and now requesting you to add a comment like that since you confirmed that it's true.
transport/http2_server.go
Outdated
| @@ -683,20 +683,38 @@ func (t *http2Server) handleWindowUpdate(f *http2.WindowUpdateFrame) { | |||
| }) | |||
| } | |||
|
|
|||
| func createHeaderFieldsFromMD(headerFields []hpack.HeaderField, md metadata.MD) []hpack.HeaderField { | |||
There was a problem hiding this comment.
Nit: maybe "appendHeaderFieldsFromMD"? This modifies the slice and returns it just like append does.
dfawley
approved these changes
May 21, 2018
a-robinson
added a commit
to a-robinson/cockroach
that referenced
this pull request
May 23, 2018
Un-reverts cockroachdb#24883 to include grpc/grpc-go#2074 This also removed hdrhistogram-writer because it apparently isn't used anymore. Release note: None
craig bot
pushed a commit
to cockroachdb/cockroach
that referenced
this pull request
May 23, 2018
25676: storage: Fix flaky TestReplicaNotLeaseHolderError r=a-robinson a=a-robinson Caused by the proactive renewal of expiration-based leases (see #25322 and #25625 for more detail). Fixes #25731 Release note: None I'm not sure how many more of these flakes to expect over the next couple weeks. I'm currently running `stressrace` on all of `pkg/storage` on a gceworker to try and ferret them out if there are any more, but there's no guarantee that'll find all of them. 25816: ui: don't show login indicator unless login is enabled r=couchand a=couchand In #25005 I accidentally let the login indicator leak even if the environment variable wasn't set. This corrects that issue. Release note: None Fixes: #25843 25853: dep: Bump grpc-go to include perf improvements and data race fix r=a-robinson a=a-robinson Un-reverts #24883 to include grpc/grpc-go#2074 This also removed hdrhistogram-writer because it apparently isn't used anymore. Release note: None Maybe we want to wait until they put this into a more formal release SHA, though. Co-authored-by: Alex Robinson <[email protected]> Co-authored-by: Andrew Couch <[email protected]>
dfawley
changed the title
|
Can we release v1.12.1 with this cherry-picked? Thanks! |
menghanl
pushed a commit
that referenced
this pull request
Jun 6, 2018
|
@gyuho Sorry for the delay. Just did: https://github.com/grpc/grpc-go/releases/tag/v1.12.1 |
|
@menghanl No problem! And thanks a lot! |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Since
RecvMsgcan lead to aWriteStatuscall, it is possible thatWriteHeaderandWriteStatusare run in parallel. Thus we must synchronize on header and trailer metadata accessed by both.This doesn't have significant performance impact; adds ~500ns to a 1 byte req/resp unary RPC.
Fixes #1972