Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

xdsclient: populate error details for NACK #3975

Merged
merged 2 commits into from Oct 22, 2020

Conversation

menghanl
Copy link
Contributor

fixes #3969

)
switch update := u.(type) {
case *watchAction:
target, rType, version, nonce = t.processWatchInfo(update)
case *ackAction:
target, rType, version, nonce, send = t.processAckInfo(update, stream)
target, rType, version, nonce, errMsg, send = t.processAckInfo(update, stream)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why does processAckInfo have to return the errMsg. Why can't we use it directly here? It is available in update.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right. This is unnecessary, and processAckInfo cannot change it anyway. Done.

@easwars easwars assigned menghanl and unassigned easwars Oct 21, 2020
send bool
target []string
rType ResourceType
version, nonce, errMsg string
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: We might as well get rid of errMsg and use update.errMsg directly.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's a switch: case. Only ackAction has the errMsg field.

@menghanl menghanl merged commit 37b72f9 into grpc:master Oct 22, 2020
@menghanl menghanl deleted the xds_nack_error_details branch October 22, 2020 20:20
@dfawley dfawley modified the milestones: 1.34 Release, 1.33 Release Nov 6, 2020
@github-actions github-actions bot locked as resolved and limited conversation to collaborators May 25, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

xds: NACKs missing error detail
5 participants