grpc: fix a bug introduced in #7461 #7505
Merged
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
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #7505 +/- ##
==========================================
- Coverage 81.58% 81.52% -0.06%
==========================================
Files 358 358
Lines 27388 27390 +2
==========================================
- Hits 22345 22331 -14
- Misses 3828 3836 +8
- Partials 1215 1223 +8
|
dfawley
reviewed
Aug 13, 2024
stream.go
Outdated
| @@ -1121,7 +1121,8 @@ func (a *csAttempt) recvMsg(m any, payInfo *payloadInfo) (err error) { | |||
| } | |||
| // Special handling for non-server-stream rpcs. | |||
| // This recv expects EOF or errors, so we don't collect inPayload. | |||
| if err := recv(a.p, cs.codec, a.s, a.dc, m, *cs.callInfo.maxReceiveMessageSize, nil, a.decomp, false); err == nil { | |||
| err = recv(a.p, cs.codec, a.s, a.dc, m, *cs.callInfo.maxReceiveMessageSize, nil, a.decomp, false) | |||
There was a problem hiding this comment.
How about something like this instead:
if err := recv(); err == io.EOF {
return a.s.Status().Err() // expected; return stream status error
} else if err != nil {
return toRPCErr(err) // other error
}
return ...gOt <nil>, wanted io.EOF... // no end stream??
dfawley
reviewed
Aug 13, 2024
| } | ||
| return toRPCErr(err) | ||
| return toRPCErr(errors.New("grpc: client streaming protocol violation: get <nil>, want <EOF>")) |
There was a problem hiding this comment.
Oops. Didn't see this comment in the excitement to merge this :(
dfawley
approved these changes
Aug 13, 2024
infovivek2020
pushed a commit
to infovivek2020/grpc-go
that referenced
this pull request
Aug 18, 2024
16 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
When I was reviewing #7461, I made a comment to replace some lines which read as:
to be replaced as:
Little did I realize that the
errvalue was being used below. Luckily this did not make it into the release, which we haven't yet cut. So, no release notes required.This wasn't caught as a compile error, because
errwas a named return parameter. I'm not making the changes in this PR to not haveerras a named return parameter though.RELEASE NOTES: none