Skip to content

support custom hosts file size #349

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.

Sign up for GitHub

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

Merged
ibauersachs merged 4 commits into from
Nov 25, 2024
+21 −1
Merged

support custom hosts file size #349

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2d61334
support custom hosts file size
flaming-archer Oct 28, 2024
99afd48
add tests and document
flaming-archer Nov 14, 2024
801299c
changer for review
flaming-archer Nov 25, 2024
d060419
change again for review
flaming-archer Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions README.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,12 @@ Do NOT use it.
|true
|false

.2+|dnsjava.hostsfile.max_size
Comment thread
ibauersachs marked this conversation as resolved.
Outdated
3+|Set the size of the hosts file to be loaded at a time,in bytes.
Comment thread
ibauersachs marked this conversation as resolved.
Outdated
|Integer
|16384
|1000000

.2+|dnsjava.nio.selector_timeout
3+|Set selector timeout in milliseconds. Default/Max 1000, Min 1.
|Integer
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/xbill/DNS/hosts/HostsFileParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
*/
@Slf4j
public final class HostsFileParser {
private static final int MAX_FULL_CACHE_FILE_SIZE_BYTES = 16384;
private final int MAX_FULL_CACHE_FILE_SIZE_BYTES = Integer.parseInt(
System.getProperty("dnsjava.hostsfile.max_size_bytes", "16384"));

private final Map<String, InetAddress> hostsCache = new HashMap<>();
private final Path path;
Expand Down
13 changes: 13 additions & 0 deletions src/test/java/org/xbill/DNS/hosts/HostsFileParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,19 @@ void testBigFileIsNotCompletelyCachedA() throws IOException {
assertEquals(1, hostsFileParser.cacheSize());
}

@Test
void testBigFileCompletelyCachedA() throws IOException {
System.setProperty("dnsjava.hostsfile.max_size_bytes", 1024 * 1024 * 1024 + "");
HostsFileParser hostsFileParser = generateLargeHostsFile("testBigFileCompletelyCachedA");
Comment thread
ibauersachs marked this conversation as resolved.
Outdated
try {
hostsFileParser.getAddressForHost(Name.fromConstantString("localhost-10."), Type.A)
.orElseThrow(() -> new IllegalStateException("Host entry not found"));
assertEquals(1280, hostsFileParser.cacheSize());
} finally {
System.clearProperty("dnsjava.hostsfile.max_size_bytes");
}
}

@Test
void testBigFileIsNotCompletelyCachedAAAA() throws IOException {
HostsFileParser hostsFileParser =
Expand Down