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

dns: do not call NewServiceConfig when lookups are disabled #3201

Merged
merged 3 commits into from
Nov 22, 2019

Conversation

dfawley
Copy link
Member

@dfawley dfawley commented Nov 21, 2019

Also:

  • Fully ignore NewServiceConfig calls in resolver_conn_wrapper
  • Fix dns_resolver_test to actually test service configs, and a handful of cleanups

Fixes #3199


This change is Reviewable

Copy link
Contributor

@menghanl menghanl 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 3 files at r1.
Reviewable status: 2 of 3 files reviewed, 1 unresolved discussion (waiting on @dfawley and @menghanl)


internal/resolver/dns/dns_resolver_test.go, line 614 at r1 (raw file):

	var r []string
	for i := 0; i < len(b); i += txtBytesLimit {

Copy copy the comment with the code?

Copy link
Contributor

@menghanl menghanl left a comment

Choose a reason for hiding this comment

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

Reviewed 1 of 3 files at r1.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @dfawley)

@dfawley dfawley added this to the 1.26 Release milestone Nov 22, 2019
Copy link
Member Author

@dfawley dfawley 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, 1 unresolved discussion (waiting on @menghanl)


internal/resolver/dns/dns_resolver_test.go, line 614 at r1 (raw file):

Previously, menghanl (Menghan Li) wrote…

Copy copy the comment with the code?

Done.

Copy link
Contributor

@menghanl menghanl left a comment

Choose a reason for hiding this comment

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

Reviewed 1 of 1 files at r2, 1 of 1 files at r3.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

@dfawley dfawley merged commit cb47f38 into grpc:master Nov 22, 2019
@dfawley dfawley deleted the dns_txt branch November 22, 2019 21:38
arminbuerkle pushed a commit to alfatraining/grpc-go that referenced this pull request Dec 4, 2019
@lock lock bot locked as resolved and limited conversation to collaborators May 20, 2020
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.

Re-resolution loop when service config is not supported
2 participants