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

xds/resolver: support inline RDS resource from LDS response #4299

Merged
merged 6 commits into from Mar 31, 2021

Conversation

menghanl
Copy link
Contributor

@menghanl menghanl commented Mar 25, 2021

Needed by direct path.

// inline RDS resource.

// If there was an RDS watch, cancel it.
if w.rdsName != "" {
Copy link
Member

Choose a reason for hiding this comment

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

This outer if seems unnecessary.

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

return
}

// RDS name from update is not an empty string, start RDS watch.
Copy link
Member

Choose a reason for hiding this comment

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

This seems like it's documenting the if immediately below, but it isn't.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Modified (a little bit).

@menghanl menghanl modified the milestones: 1.37 Release, 1.38 Release Mar 31, 2021
@@ -110,6 +110,24 @@ func (w *serviceUpdateWatcher) handleLDSResp(update xdsclient.ListenerUpdate, er
httpFilterConfig: update.HTTPFilters,
}

if update.InlineRouteConfig != nil {
// The LDS resp received has an inline RDS resource.
Copy link
Contributor

Choose a reason for hiding this comment

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

Nit: maybe get rid of this comment?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

@menghanl menghanl merged commit c72e1c8 into grpc:master Mar 31, 2021
@menghanl menghanl deleted the lds_rds_inline branch March 31, 2021 23:30
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 28, 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.

None yet

3 participants