I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

don't fail the tunnels used to send/receive a request on a lost reply, as the potential that they're to blame is only 1 out of 5.

Browse Source 
(and if other people's tunnels suck, that leads us to kill all of our tunnels.  which is Bad)
This commit is contained in:
jrandom
2004-08-27 20:56:00 +00:00
committed by zzz
parent 3e0b7bfeff
commit f57adc9cc4
2 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
router/java/src/net/i2p/router/peermanager/ProfileOrganizer.java
View File

@ -253,12 +253,12 @@ public class ProfileOrganizer {
locked_selectPeers(_fastPeers, howMany, exclude, matches);
}
if (matches.size() < howMany) {
if (_log.shouldLog(Log.DEBUG))
_log.debug("selectFastPeers("+howMany+"), not enough fast (" + matches.size() + ") going on to highCap");
if (_log.shouldLog(Log.INFO))
_log.info("selectFastPeers("+howMany+"), not enough fast (" + matches.size() + ") going on to highCap");
selectHighCapacityPeers(howMany, exclude, matches);
} else {
if (_log.shouldLog(Log.DEBUG))
_log.debug("selectFastPeers("+howMany+"), found enough fast (" + matches.size() + ")");
if (_log.shouldLog(Log.INFO))
_log.info("selectFastPeers("+howMany+"), found enough fast (" + matches.size() + ")");
}
return;
}
@ -279,12 +279,12 @@ public class ProfileOrganizer {
locked_selectPeers(_highCapacityPeers, howMany, exclude, matches);
}
if (matches.size() < howMany) {
if (_log.shouldLog(Log.DEBUG))
_log.debug("selectHighCap("+howMany+"), not enough fast (" + matches.size() + ") going on to notFailing");
if (_log.shouldLog(Log.INFO))
_log.info("selectHighCap("+howMany+"), not enough fast (" + matches.size() + ") going on to notFailing");
selectNotFailingPeers(howMany, exclude, matches);
} else {
if (_log.shouldLog(Log.DEBUG))
_log.debug("selectHighCap("+howMany+"), found enough highCap (" + matches.size() + ")");
if (_log.shouldLog(Log.INFO))
_log.info("selectHighCap("+howMany+"), found enough highCap (" + matches.size() + ")");
}
return;
}
@ -297,12 +297,12 @@ public class ProfileOrganizer {
locked_selectPeers(_wellIntegratedPeers, howMany, exclude, matches);
}
if (matches.size() < howMany) {
if (_log.shouldLog(Log.DEBUG))
_log.debug("selectWellIntegrated("+howMany+"), not enough integrated (" + matches.size() + ") going on to notFailing");
if (_log.shouldLog(Log.INFO))
_log.info("selectWellIntegrated("+howMany+"), not enough integrated (" + matches.size() + ") going on to notFailing");
selectNotFailingPeers(howMany, exclude, matches);
} else {
if (_log.shouldLog(Log.DEBUG))
_log.debug("selectWellIntegrated("+howMany+"), found enough well integrated (" + matches.size() + ")");
if (_log.shouldLog(Log.INFO))
_log.info("selectWellIntegrated("+howMany+"), found enough well integrated (" + matches.size() + ")");
}
return;
@ -369,17 +369,17 @@ public class ProfileOrganizer {
}
}
}
if (_log.shouldLog(Log.DEBUG))
_log.debug("Selecting all not failing found " + (matches.size()-orig) + " new peers: " + selected);
if (_log.shouldLog(Log.INFO))
_log.info("Selecting all not failing found " + (matches.size()-orig) + " new peers: " + selected);
matches.addAll(selected);
}
if (matches.size() < howMany) {
if (_log.shouldLog(Log.DEBUG))
_log.debug("selectAllNotFailing("+howMany+"), not enough (" + matches.size() + ") going on to failing");
if (_log.shouldLog(Log.INFO))
_log.info("selectAllNotFailing("+howMany+"), not enough (" + matches.size() + ") going on to failing");
selectFailingPeers(howMany, exclude, matches);
} else {
if (_log.shouldLog(Log.DEBUG))
_log.debug("selectAllNotFailing("+howMany+"), enough (" + matches.size() + ")");
if (_log.shouldLog(Log.INFO))
_log.info("selectAllNotFailing("+howMany+"), enough (" + matches.size() + ")");
}
return;
}
@ -477,8 +477,8 @@ public class ProfileOrganizer {
int minFastPeers = getMinimumFastPeers();
int numToPromote = minFastPeers - _fastPeers.size();
if (numToPromote > 0) {
if (_log.shouldLog(Log.DEBUG))
_log.debug("Need to explicitly promote " + numToPromote + " peers to the fast group");
if (_log.shouldLog(Log.INFO))
_log.info("Need to explicitly promote " + numToPromote + " peers to the fast group");
for (Iterator iter = _strictCapacityOrder.iterator(); iter.hasNext(); ) {
PeerProfile cur = (PeerProfile)iter.next();
if ( (!_fastPeers.containsKey(cur.getPeer())) && (!cur.getIsFailing()) ) {

7
router/java/src/net/i2p/router/tunnelmanager/RequestTunnelJob.java
View File

@ -678,9 +678,10 @@ public class RequestTunnelJob extends JobImpl {
getContext().profileManager().tunnelRejected(_tunnel.getThisHop(), responseTime, false);
getContext().profileManager().messageFailed(_tunnel.getThisHop());
// one (or both) of the tunnels used to send the request / receive a reply failed
_pool.tunnelFailed(_replyTunnelId);
_pool.tunnelFailed(_outboundTunnelId);
// one (or both) of the tunnels used to send the request / receive
// a reply failed, or the peer failed, or the peer's tunnels failed
//_pool.tunnelFailed(_replyTunnelId);
//_pool.tunnelFailed(_outboundTunnelId);
Failure.this.getContext().statManager().updateFrequency("tunnel.buildFailFrequency");
fail();