Qortal/altcoinj
1
0
Fork 1
mirror of https://github.com/Qortal/altcoinj.git synced 2025-11-03 05:57:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rate limit peer discovery

Browse Source 
This changes PeerGroup to consider a peer discovery that doesn't return
enough results as a failure, so it does exponential backoff. Otherwise
it discovers constantly on a network with less than the maximum peers
available.

Also added a second sanity check to ensure it's never done more than
once a second.
This commit is contained in:
Ross Nicoll
2015-12-25 15:17:02 +00:00
committed by Andreas Schildbach
parent c82aa3b070
commit cfb942a7fa
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/main/java/org/bitcoinj/core/PeerGroup.java
View File

@@ -476,6 +476,7 @@ public class PeerGroup implements TransactionBroadcaster {
private Runnable triggerConnectionsJob = new Runnable() { private Runnable triggerConnectionsJob = new Runnable() {
private boolean firstRun = true; private boolean firstRun = true;
private final static long MIN_PEER_DISCOVERY_INTERVAL = 1000L;
@Override @Override
public void run() { public void run() {
@@ -525,7 +526,9 @@ public class PeerGroup implements TransactionBroadcaster {
lock.lock(); lock.lock();
try { try {
if (doDiscovery) { if (doDiscovery) {
if (discoverySuccess) { // Require that we have enough connections, to consider this
// a success, or we just constantly test for new peers
if (discoverySuccess && countConnectedAndPendingPeers() >= getMaxConnections()) {
groupBackoff.trackSuccess(); groupBackoff.trackSuccess();
} else { } else {
groupBackoff.trackFailure(); groupBackoff.trackFailure();
@@ -534,8 +537,10 @@ public class PeerGroup implements TransactionBroadcaster {
// Inactives is sorted by backoffMap time. // Inactives is sorted by backoffMap time.
if (inactives.isEmpty()) { if (inactives.isEmpty()) {
if (countConnectedAndPendingPeers() < getMaxConnections()) { if (countConnectedAndPendingPeers() < getMaxConnections()) {
log.info("Peer discovery didn't provide us any more peers, will try again later."); long interval = Math.max(groupBackoff.getRetryTime() - now, MIN_PEER_DISCOVERY_INTERVAL);
executor.schedule(this, groupBackoff.getRetryTime() - now, TimeUnit.MILLISECONDS); log.info("Peer discovery didn't provide us any more peers, will try again in "
+ interval + "ms.");
executor.schedule(this, interval, TimeUnit.MILLISECONDS);
} else { } else {
// We have enough peers and discovery provided no more, so just settle down. Most likely we // We have enough peers and discovery provided no more, so just settle down. Most likely we
// were given a fixed set of addresses in some test scenario. // were given a fixed set of addresses in some test scenario.