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

dont penalize send failures (beyond what we already do for comm errors)

Browse Source 
keep a rate for tunnel rejection, rather than a simple 'last' occurrance, and penalize the reliability with it
This commit is contained in:
jrandom
2004-07-09 03:45:11 +00:00
committed by zzz
parent 8e64ffb4f6
commit bdfa6e4af5
2 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
router/java/src/net/i2p/router/peermanager/ReliabilityCalculator.java
View File

@ -32,9 +32,14 @@ public class ReliabilityCalculator extends Calculator {
val += profile.getTunnelCreateResponseTime().getRate(60*60*1000).getCurrentEventCount(); val += profile.getTunnelCreateResponseTime().getRate(60*60*1000).getCurrentEventCount();
val += profile.getTunnelCreateResponseTime().getRate(60*60*1000).getLastEventCount(); val += profile.getTunnelCreateResponseTime().getRate(60*60*1000).getLastEventCount();
val -= profile.getSendFailureSize().getRate(60*1000).getLastEventCount() * 5; //val -= profile.getSendFailureSize().getRate(60*1000).getLastEventCount() * 5;
val -= profile.getSendFailureSize().getRate(60*60*1000).getCurrentEventCount()*2; //val -= profile.getSendFailureSize().getRate(60*60*1000).getCurrentEventCount()*2;
val -= profile.getSendFailureSize().getRate(60*60*1000).getLastEventCount()*2; //val -= profile.getSendFailureSize().getRate(60*60*1000).getLastEventCount()*2;
val -= profile.getTunnelHistory().getRejectionRate().getRate(60*1000).getCurrentEventCount() * 50;
val -= profile.getTunnelHistory().getRejectionRate().getRate(60*1000).getLastEventCount() * 25;
val -= profile.getTunnelHistory().getRejectionRate().getRate(60*60*1000).getCurrentEventCount() * 5;
val -= profile.getTunnelHistory().getRejectionRate().getRate(60*60*1000).getLastEventCount() * 1;
// penalize them heavily for dropping netDb requests // penalize them heavily for dropping netDb requests
val -= profile.getDBHistory().getFailedLookupRate().getRate(60*1000).getCurrentEventCount() * 10; val -= profile.getDBHistory().getFailedLookupRate().getRate(60*1000).getCurrentEventCount() * 10;

22
router/java/src/net/i2p/router/peermanager/TunnelHistory.java
View File

@ -5,6 +5,8 @@ import java.io.OutputStream;
import java.util.Properties; import java.util.Properties;
import net.i2p.router.RouterContext; import net.i2p.router.RouterContext;
import net.i2p.stat.RateStat;
import net.i2p.util.Log;
/** /**
* Tunnel related history information * Tunnel related history information
@ -12,21 +14,29 @@ import net.i2p.router.RouterContext;
*/ */
public class TunnelHistory { public class TunnelHistory {
private RouterContext _context; private RouterContext _context;
private Log _log;
private volatile long _lifetimeAgreedTo; private volatile long _lifetimeAgreedTo;
private volatile long _lifetimeRejected; private volatile long _lifetimeRejected;
private volatile long _lastAgreedTo; private volatile long _lastAgreedTo;
private volatile long _lastRejected; private volatile long _lastRejected;
private volatile long _lifetimeFailed; private volatile long _lifetimeFailed;
private volatile long _lastFailed; private volatile long _lastFailed;
private RateStat _rejectRate;
public TunnelHistory(RouterContext context) { public TunnelHistory(RouterContext context) {
_context = context; _context = context;
_log = context.logManager().getLog(TunnelHistory.class);
_lifetimeAgreedTo = 0; _lifetimeAgreedTo = 0;
_lifetimeFailed = 0; _lifetimeFailed = 0;
_lifetimeRejected = 0; _lifetimeRejected = 0;
_lastAgreedTo = 0; _lastAgreedTo = 0;
_lastFailed = 0; _lastFailed = 0;
_lastRejected = 0; _lastRejected = 0;
createRates();
}
private void createRates() {
_rejectRate = new RateStat("tunnelHistory.rejectRate", "How often does this peer reject a tunnel request?", "tunnelHistory", new long[] { 60*1000l, 60*60*1000l, 24*60*60*1000l });
} }
/** total tunnels the peer has agreed to participate in */ /** total tunnels the peer has agreed to participate in */
@ -48,6 +58,7 @@ public class TunnelHistory {
} }
public void incrementRejected() { public void incrementRejected() {
_lifetimeRejected++; _lifetimeRejected++;
_rejectRate.addData(1, 1);
_lastRejected = _context.clock().now(); _lastRejected = _context.clock().now();
} }
public void incrementFailed() { public void incrementFailed() {
@ -62,6 +73,8 @@ public class TunnelHistory {
public void setLastRejected(long when) { _lastRejected = when; } public void setLastRejected(long when) { _lastRejected = when; }
public void setLastFailed(long when) { _lastFailed = when; } public void setLastFailed(long when) { _lastFailed = when; }
public RateStat getRejectionRate() { return _rejectRate; }
private final static String NL = System.getProperty("line.separator"); private final static String NL = System.getProperty("line.separator");
public void store(OutputStream out) throws IOException { public void store(OutputStream out) throws IOException {
@ -77,6 +90,7 @@ public class TunnelHistory {
add(buf, "lifetimeFailed", _lifetimeFailed, "How many tunnels has the peer ever agreed to participate in that failed prematurely?"); add(buf, "lifetimeFailed", _lifetimeFailed, "How many tunnels has the peer ever agreed to participate in that failed prematurely?");
add(buf, "lifetimeRejected", _lifetimeRejected, "How many tunnels has the peer ever refused to participate in?"); add(buf, "lifetimeRejected", _lifetimeRejected, "How many tunnels has the peer ever refused to participate in?");
out.write(buf.toString().getBytes()); out.write(buf.toString().getBytes());
_rejectRate.store(out, "tunnelHistory.rejectRate");
} }
private void add(StringBuffer buf, String name, long val, String description) { private void add(StringBuffer buf, String name, long val, String description) {
@ -91,6 +105,14 @@ public class TunnelHistory {
_lifetimeAgreedTo = getLong(props, "tunnels.lifetimeAgreedTo"); _lifetimeAgreedTo = getLong(props, "tunnels.lifetimeAgreedTo");
_lifetimeFailed = getLong(props, "tunnels.lifetimeFailed"); _lifetimeFailed = getLong(props, "tunnels.lifetimeFailed");
_lifetimeRejected = getLong(props, "tunnels.lifetimeRejected"); _lifetimeRejected = getLong(props, "tunnels.lifetimeRejected");
try {
_rejectRate.load(props, "tunnelHistory.rejectRate", true);
_log.debug("Loading tunnelHistory.rejectRate");
} catch (IllegalArgumentException iae) {
_log.warn("TunnelHistory reject rate is corrupt, resetting", iae);
createRates();
}
} }
private final static long getLong(Properties props, String key) { private final static long getLong(Properties props, String key) {