Skip to content

Move XdsClient instantiation into xds resolver.#20476

Merged
markdroth merged 1 commit intogrpc:masterfrom
markdroth:xds_client_in_resolver
Oct 17, 2019
Merged

Move XdsClient instantiation into xds resolver.#20476
markdroth merged 1 commit intogrpc:masterfrom
markdroth:xds_client_in_resolver

Conversation

@markdroth
Copy link
Copy Markdown
Member

@markdroth markdroth commented Oct 3, 2019

Built on #20380.


This change is Reviewable

@markdroth markdroth added the release notes: no Indicates if PR should not be in release notes label Oct 3, 2019
@markdroth markdroth force-pushed the xds_client_in_resolver branch from 6679849 to 2cfd789 Compare October 10, 2019 14:32
@markdroth markdroth marked this pull request as ready for review October 10, 2019 14:33
@markdroth
Copy link
Copy Markdown
Member Author

This is now ready for review. The first commit is the changes from #20380; the second commit is new.

@markdroth
Copy link
Copy Markdown
Member Author

#20380 has been merged, and I've merged in from master here, so this PR now contains only its own changes.

Copy link
Copy Markdown
Contributor

@AspirinSJL AspirinSJL left a comment

Choose a reason for hiding this comment

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

Reviewed 5 of 10 files at r1, 5 of 5 files at r2.
Reviewable status: all files reviewed, 4 unresolved discussions (waiting on @apolcyn and @markdroth)


src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc, line 60 at r2 (raw file):

parent_

Generally, I feel it's more readable to explicitly name the object (e.g., xds_resolver) instead of parent. It's slightly easier for me to figure out xds_resolver is the parent than to figure out parent is the xds_resolver. I think this difference is more significant for other readers.


src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc, line 99 at r2 (raw file):

            grpc_error_string(error));
    result_handler()->ReturnError(error);
    return;

This line is unnecessary.


src/core/ext/filters/client_channel/xds/xds_client.cc, line 100 at r2 (raw file):

owing

This needs reverting.


src/core/ext/filters/client_channel/xds/xds_client.cc, line 112 at r2 (raw file):

EDS

Keeping it as ADS may make more sense since the class is called AdsCallState.

Copy link
Copy Markdown
Member Author

@markdroth markdroth left a comment

Choose a reason for hiding this comment

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

Reviewable status: all files reviewed, 4 unresolved discussions (waiting on @apolcyn and @AspirinSJL)


src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc, line 60 at r2 (raw file):

Previously, AspirinSJL (Juanli Shen) wrote…
parent_

Generally, I feel it's more readable to explicitly name the object (e.g., xds_resolver) instead of parent. It's slightly easier for me to figure out xds_resolver is the parent than to figure out parent is the xds_resolver. I think this difference is more significant for other readers.

Done.


src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc, line 99 at r2 (raw file):

Previously, AspirinSJL (Juanli Shen) wrote…

This line is unnecessary.

Done.


src/core/ext/filters/client_channel/xds/xds_client.cc, line 100 at r2 (raw file):

Previously, AspirinSJL (Juanli Shen) wrote…
owing

This needs reverting.

Done.


src/core/ext/filters/client_channel/xds/xds_client.cc, line 112 at r2 (raw file):

Previously, AspirinSJL (Juanli Shen) wrote…
EDS

Keeping it as ADS may make more sense since the class is called AdsCallState.

Done.

@markdroth
Copy link
Copy Markdown
Member Author

This is now built on #20606.

@markdroth
Copy link
Copy Markdown
Member Author

#20606 has been merged, and I've merged the changes in here, so this PR now contains only its own changes again.

Copy link
Copy Markdown
Contributor

@AspirinSJL AspirinSJL left a comment

Choose a reason for hiding this comment

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

Reviewed 2 of 25 files at r3, 1 of 1 files at r5.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @apolcyn)

@markdroth
Copy link
Copy Markdown
Member Author

Known issues: #20436 #15027 #20639 #20625

The Mac and iOS failures look like a transient problem due to a failure to fetch ruby gems.

@markdroth markdroth force-pushed the xds_client_in_resolver branch from 1031677 to 1564207 Compare October 17, 2019 14:30
@markdroth markdroth merged commit feae38d into grpc:master Oct 17, 2019
@markdroth markdroth deleted the xds_client_in_resolver branch October 17, 2019 15:35
@lock lock bot locked as resolved and limited conversation to collaborators Jan 15, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

release notes: no Indicates if PR should not be in release notes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants