core: fix a bug in health check config propgation. - #6804
Merged
Conversation
The condition "effectiveServiceConfig != validServiceConfig" should have been deleted in commit 2162ad0. The condition was there before that commit because NAME_RESOLVER_SERVICE_CONFIG was already in "attrs", thus it needed to be re-added only if "effectiveServiceConfig" differs from the original "validServiceConfig". In contrast, ATTR_HEALTH_CHECKING_CONFIG is not in the original "attrs" and always needs to be added.
ejona86
approved these changes
Mar 5, 2020
ejona86
left a comment
ejona86
left a comment
Member
There was a problem hiding this comment.
Arg. I was watching that condition earlier, but then didn't check it in the end...
dfawley
pushed a commit
to dfawley/grpc-java
that referenced
this pull request
Jan 15, 2021
The condition "effectiveServiceConfig != validServiceConfig" should have been deleted in commit 2162ad0. The condition was there before that commit because NAME_RESOLVER_SERVICE_CONFIG was already in "attrs", thus it needed to be re-added only if "effectiveServiceConfig" differs from the original "validServiceConfig". In contrast, ATTR_HEALTH_CHECKING_CONFIG is not in the original "attrs" and always needs to be added.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The condition "effectiveServiceConfig != validServiceConfig" should
have been deleted in commit 2162ad0.
The condition was there before that commit because
NAME_RESOLVER_SERVICE_CONFIG was already in "attrs", thus it needed to
be re-added only if "effectiveServiceConfig" differs from the original
"validServiceConfig".
In contrast, ATTR_HEALTH_CHECKING_CONFIG is not in the original
"attrs" and always needs to be added.