zzz/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

handle a situation that would otherwise cause a search to block indefinitely rather than complete properly

Browse Source
This commit is contained in:
jrandom
2004-08-18 07:20:27 +00:00
committed by zzz
parent a45e1b4781
commit 9753470dcb
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
router/java/src/net/i2p/router/networkdb/kademlia/SearchJob.java
View File

@@ -187,6 +187,7 @@ class SearchJob extends JobImpl {
}
} else {
_state.addPending(closestHashes);
int sent = 0;
for (Iterator iter = closestHashes.iterator(); iter.hasNext(); ) {
Hash peer = (Hash)iter.next();
DataStructure ds = _facade.getDataStore().get(peer);
@@ -196,17 +197,30 @@ class SearchJob extends JobImpl {
+ peer + " : " + (ds == null ? "null" : ds.getClass().getName()));
} else {
sendSearch((RouterInfo)ds);
sent++;
}
}
if (sent <= 0) {
// the (potentially) last peers being searched for could not be,
// er, searched for, so lets retry ASAP (causing either another
// peer to be selected, or the whole search to fail)
if (_log.shouldLog(Log.WARN))
_log.warn(getJobId() + ": No new peer queued up, so we are going to requeue " +
"ourselves in our search for " + _state.getTarget().toBase64());
requeuePending(0);
}
}
}
private void requeuePending() {
requeuePending(5*1000);
}
private void requeuePending(long ms) {
if (_pendingRequeueJob == null)
_pendingRequeueJob = new RequeuePending();
long now = getContext().clock().now();
if (_pendingRequeueJob.getTiming().getStartAfter() < now)
_pendingRequeueJob.getTiming().setStartAfter(now+5*1000);
_pendingRequeueJob.getTiming().setStartAfter(now+ms);
getContext().jobQueue().addJob(_pendingRequeueJob);
}