Move XdsClient instantiation into xds resolver.#20476
Conversation
6679849 to
2cfd789
Compare
|
This is now ready for review. The first commit is the changes from #20380; the second commit is new. |
|
#20380 has been merged, and I've merged in from master here, so this PR now contains only its own changes. |
AspirinSJL
left a comment
There was a problem hiding this comment.
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.
markdroth
left a comment
There was a problem hiding this comment.
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 ofparent. It's slightly easier for me to figure outxds_resolveris the parent than to figure outparentis thexds_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…
owingThis needs reverting.
Done.
src/core/ext/filters/client_channel/xds/xds_client.cc, line 112 at r2 (raw file):
Previously, AspirinSJL (Juanli Shen) wrote…
EDSKeeping it as
ADSmay make more sense since the class is calledAdsCallState.
Done.
|
This is now built on #20606. |
|
#20606 has been merged, and I've merged the changes in here, so this PR now contains only its own changes again. |
AspirinSJL
left a comment
There was a problem hiding this comment.
Reviewed 2 of 25 files at r3, 1 of 1 files at r5.
Reviewable status:complete! all files reviewed, all discussions resolved (waiting on @apolcyn)
1031677 to
1564207
Compare
Built on #20380.
This change is