Skip to content

DNSRequester: reduce delay without hostname 100x #1111

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

Open
ArneBab wants to merge 1 commit into
base: next
Choose a base branch
from
Open

DNSRequester: reduce delay without hostname 100x #1111

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 11 additions & 1 deletion src/freenet/node/DNSRequester.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@
import java.util.Arrays;
import java.util.Deque;
import java.util.HashSet;
import java.util.Objects;
import java.util.Set;

import freenet.io.comm.FreenetInetAddress;
import freenet.io.comm.Peer;
import freenet.support.LogThresholdCallback;
import freenet.support.Logger;
import freenet.support.Logger.LogLevel;
Expand Down Expand Up @@ -81,10 +84,15 @@ private void realRun() {
}

int unconnectedNodesLength = nodesToCheck.length;
boolean peerHasHostname = false;
if (unconnectedNodesLength > 0) {
// check a randomly chosen node that has not been checked
// recently to avoid sending bursts of DNS requests
PeerNode pn = nodesToCheck[node.getFastWeakRandom().nextInt(unconnectedNodesLength)];
peerHasHostname = pn.nominalPeer.stream()
.map(Peer::getFreenetAddress)
.filter(Objects::nonNull)
.anyMatch(FreenetInetAddress::hasHostname);
if (unconnectedNodesLength < 5) {
// no need for optimizations: just clear all state
recentNodeIdentitySet.clear();
Expand All @@ -102,7 +110,9 @@ private void realRun() {
pn.maybeUpdateHandshakeIPs(false);
}

int nextMaxWaitTime = 1000 + node.getFastWeakRandom().nextInt(60000);
// wait longer after DNS requests
int multiplier = peerHasHostname ? 100 : 1;
int nextMaxWaitTime = multiplier * (10 + node.getFastWeakRandom().nextInt(600));
try {
synchronized(this) {
wait(nextMaxWaitTime); // sleep 1-61s ...
Expand Down