Fix a bug where an incorrect executor used for DNS refresh query #6092
Conversation
This file contains 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
Motivation: Each `CacheEntry` should be bound to a specific `RefreshingAddressResolver`, and the associated DNS refresh query must be executed using its own executor. However, there was a bug where the refresh query could be mistakenly executed by the executor of a different resolver accessing the same `CacheEntry`. Modifications: - Ensured that the DNS refresh query is always executed by the correct `RefreshingAddressResolver`'s executor. Result: - DNS refresh query is executed by the correct executor. - Close line#5891 line#6003
|
I couldn't make a test case for this. Please bear with me. 🙏 |
minwoox
commented
Feb 11, 2025
| @@ -220,8 +221,7 @@ public void onRemoval(DnsQuestion question, @Nullable List<DnsRecord> records, | |||
| final CacheEntry entry = addressResolverCache.getIfPresent(hostname); | |||
| if (entry != null) { | |||
| if (entry.refreshable()) { | |||
| // onRemoval is invoked by the executor of 'dnsResolverCache'. | |||
| executor().execute(entry::refresh); | |||
There was a problem hiding this comment.
refresh should be called by the entry's executor not by the executor who gets this cache entry from addressResolverCache.
jrhee17
approved these changes
Feb 12, 2025
| @@ -263,6 +263,7 @@ public void close() { | |||
|
|
|||
| final class CacheEntry { | |||
There was a problem hiding this comment.
Note: It may make more sense that CacheEntry is not bound to a specific resolver. Since there may be more changes involved, I'm fine with the current implementation
Suggested change
| final class CacheEntry { | |
| static final class CacheEntry { |
There was a problem hiding this comment.
The resolverClosed flag is shared with CacheEntry so I just couldn't make this class static. Let me try that later if we really need to. 😉
ikhoon
approved these changes
Feb 20, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Motivation:
Each
CacheEntryshould be bound to a specificRefreshingAddressResolver, and the associated DNS refresh query must be executed using its own executor. However, there was a bug where the refresh query could be mistakenly executed by the executor of a different resolver accessing the sameCacheEntry.Modifications:
RefreshingAddressResolver's executor.Result: