-
Notifications
You must be signed in to change notification settings - Fork 30.5k
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: implement light dns caching #49560
Open
kshitjj
wants to merge
16
commits into
nodejs:main
Choose a base branch
from
kshitjj:async-dns-resolution
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+37
−1
Open
Changes from 12 commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
db4dde6
dns: implement light dns caching
kshitjj b5a7580
dns: add default value to dnsCache
kshitjj 5d33b3f
Merge branch 'main' into async-dns-resolution
kshitjj 3038e59
fix: dns cache algorithm
kshitjj 71fc2cc
Merge branch 'nodejs:main' into async-dns-resolution
kshitjj b4f1025
fix: removed hasOwnProperty method
kshitjj c32745b
fix: removed hasOwnProperty method
kshitjj 9fff8f9
Merge branch 'main' into async-dns-resolution
kshitjj f731c16
fix: linter
kshitjj 80c60eb
fix: unref timer
kshitjj 83586ef
Refactor: DNS cache cleanup scheduling
kshitjj 090a1a0
Implement lazy cache cleanup for DNS entries
kshitjj 514f8e2
performance: changed deleting method
kshitjj 1c6a9f6
dns: fix test/test-tls-connect-address-family.js
kshitjj d217c14
Merge branch 'nodejs:main' into async-dns-resolution
kshitjj 0524d3b
Merge branch 'main' into async-dns-resolution
kshitjj File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -31,6 +31,7 @@ const cares = internalBinding('cares_wrap'); | |
const { isIP } = require('internal/net'); | ||
const { customPromisifyArgs } = require('internal/util'); | ||
const errors = require('internal/errors'); | ||
const { setTimeout, unref } = require('timers'); | ||
const { | ||
bindDefaultResolver, | ||
setDefaultResolver, | ||
|
@@ -133,10 +134,33 @@ function onlookupall(err, addresses) { | |
} | ||
} | ||
|
||
function cleanExpiredDnsCache() { | ||
const currentTime = DateNow(); | ||
for (const key in dnsCache) { | ||
if (currentTime - dnsCache[key].timestamp >= 1000) { | ||
delete dnsCache[key]; | ||
} | ||
} | ||
} | ||
|
||
function addDnsEntry(cacheKey, address, family) { | ||
dnsCache[cacheKey] = { | ||
address, | ||
family, | ||
timestamp: DateNow(), | ||
}; | ||
|
||
cleanExpiredDnsCache(); | ||
|
||
return dnsCache[cacheKey]; | ||
} | ||
|
||
// Easy DNS A/AAAA look up | ||
// lookup(hostname, [options,] callback) | ||
const validFamilies = [0, 4, 6]; | ||
const dnsCache = { __proto__: null }; | ||
const { DateNow } = primordials; | ||
let cleanupTimeout = null; | ||
function lookup(hostname, options, callback) { | ||
let hints = 0; | ||
let family = 0; | ||
|
@@ -212,8 +236,23 @@ function lookup(hostname, options, callback) { | |
return {}; | ||
} | ||
|
||
const cacheKey = `${hostname}_${family || 'default'}`; | ||
const cachedResult = dnsCache[cacheKey]; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. A read-through cache approach would be a bit simpler here. essentially something like
|
||
|
||
if (cachedResult) { | ||
cleanExpiredDnsCache(); | ||
callback(null, cachedResult.address, cachedResult.family); | ||
return {}; | ||
} | ||
|
||
|
||
const req = new GetAddrInfoReqWrap(); | ||
req.callback = callback; | ||
req.callback = (error, address, family) => { | ||
if (!error) { | ||
addDnsEntry(cacheKey, address, family); | ||
} | ||
callback(error, address, family); | ||
}; | ||
req.family = family; | ||
req.hostname = hostname; | ||
req.oncomplete = all ? onlookupall : onlookup; | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Changing
dnsCache
to aMap
could be a better/faster structure to use in this case,delete
is usually slow.Refs:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If we want to keep the object rather than a
Map
, just do adnsCache[key] = undefined
.