Skip to content
New issue

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

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

Already on GitHub? # to your account

revert xds: return all ServerConfig dial options together #7712

Conversation

eshitachandwani
Copy link
Member

@eshitachandwani eshitachandwani commented Oct 9, 2024

This revert #7680 which :

  • Added a single DialOptions() method that returns a slice of all dial options for the type ServerConfig instead of individual methods to get all dial options.
  • Changed the test to wait for the custom dialer to be called.

Also reverts #7710 which :

  • Added defaultTestTimeout variable which is now unused.

Reverting this is necessary because the wait for dialer is failing in google3.

RELEASE NOTES: none

@eshitachandwani eshitachandwani added the Type: Meta Github repo, process, etc label Oct 9, 2024
@eshitachandwani eshitachandwani added this to the 1.68 Release milestone Oct 9, 2024
Copy link

codecov bot commented Oct 9, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 81.82%. Comparing base (5f178a8) to head (4f8aec2).
Report is 1 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #7712      +/-   ##
==========================================
+ Coverage   81.77%   81.82%   +0.04%     
==========================================
  Files         361      361              
  Lines       27826    27828       +2     
==========================================
+ Hits        22756    22769      +13     
+ Misses       3865     3858       -7     
+ Partials     1205     1201       -4     
Files with missing lines Coverage Δ
internal/xds/bootstrap/bootstrap.go 71.47% <100.00%> (-0.09%) ⬇️
xds/internal/xdsclient/transport/transport.go 93.30% <100.00%> (+0.07%) ⬆️

... and 16 files with indirect coverage changes

@purnesh42H purnesh42H added Type: Testing Area: Testing Includes tests and testing utilities that we have for unit and e2e tests within our repo. and removed Type: Meta Github repo, process, etc labels Oct 9, 2024
@purnesh42H purnesh42H self-requested a review October 9, 2024 06:31
@purnesh42H purnesh42H merged commit d9d8f34 into grpc:master Oct 9, 2024
14 checks passed
janardhanvissa pushed a commit to janardhanvissa/grpc-go that referenced this pull request Oct 15, 2024
* revert xds: return all ServerConfig dial options together

* revert - xdsclient: fix test build breakage
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
Area: Testing Includes tests and testing utilities that we have for unit and e2e tests within our repo. Type: Testing
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants