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

Router: Continue work on congestion caps (proposal 162)

Browse Source 
Set caps based on job lag and share bandwidth
Add 20 minute rate to tunnel.participatingMessageCountAvgPerTunnel to
be used for congestion caps
Don't set congestion cap if hidden
This commit is contained in:
zzz
2023-02-04 08:57:10 -05:00
parent c1f83d6ec9
commit f2b206b1e0
3 changed files with 40 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
router/java/src/net/i2p/router/Router.java
View File

@@ -58,6 +58,8 @@ import net.i2p.router.transport.UPnPScannerCallback;
import net.i2p.router.transport.ntcp.NTCPTransport;
import net.i2p.router.transport.udp.UDPTransport;
import net.i2p.router.util.EventLog;
import net.i2p.stat.Rate;
import net.i2p.stat.RateAverages;
import net.i2p.stat.RateStat;
import net.i2p.stat.StatManager;
import net.i2p.util.ByteCache;
@@ -1194,8 +1196,8 @@ public class Router implements RouterClock.ClockShiftListener {
if (hidden || _context.getBooleanProperty(PROP_FORCE_UNREACHABLE)) {
rv.append(CAPABILITY_UNREACHABLE);
if (CONGESTION_CAPS)
rv.append(CAPABILITY_NO_TUNNELS);
//if (CONGESTION_CAPS)
// rv.append(CAPABILITY_NO_TUNNELS);
return rv.toString();
}
switch (_context.commSystem().getStatus()) {
@@ -1240,7 +1242,39 @@ public class Router implements RouterClock.ClockShiftListener {
} else if (numTunnels > 8 * maxTunnels / 10) {
cong = CAPABILITY_CONGESTION_MODERATE;
} else {
// TODO
// this is a greatly simplified version of RouterThrottleImpl.acceptTunnelRequest()
long lag = _context.jobQueue().getMaxLag();
if (lag > 500) {
cong = CAPABILITY_CONGESTION_SEVERE;
} else if (lag > 300) {
cong = CAPABILITY_CONGESTION_MODERATE;
} else {
double bwLim = getSharePercentage() * 1024 *
Math.min(_context.bandwidthLimiter().getInboundKBytesPerSecond(),
_context.bandwidthLimiter().getOutboundKBytesPerSecond());
if (bwLim < 4*1024) {
cong = CAPABILITY_NO_TUNNELS;
} else {
RateStat rs = _context.statManager().getRate("tunnel.participatingMessageCountAvgPerTunnel");
double messagesPerTunnel = 0;
if (rs != null) {
Rate r = rs.getRate(20*60*1000);
if (r != null) {
RateAverages ra = RateAverages.getTemp();
messagesPerTunnel = r.computeAverages(ra, true).getAverage();
}
}
if (messagesPerTunnel < RouterThrottleImpl.DEFAULT_MESSAGES_PER_TUNNEL_ESTIMATE)
messagesPerTunnel = RouterThrottleImpl.DEFAULT_MESSAGES_PER_TUNNEL_ESTIMATE;
double bpsAllocated = messagesPerTunnel * numTunnels * 1024 / (10 * 60);
if (_log.shouldInfo())
_log.info("bps allocated: " + bpsAllocated + " bw limit: " + bwLim);
if (bpsAllocated > 0.9 * bwLim)
cong = CAPABILITY_CONGESTION_SEVERE;
else if (bpsAllocated > 0.8 * bwLim)
cong = CAPABILITY_CONGESTION_MODERATE;
}
}
}
}
if (cong != 0) {

4
router/java/src/net/i2p/router/RouterThrottleImpl.java
View File

@@ -293,7 +293,7 @@ public class RouterThrottleImpl implements RouterThrottle {
// of another tunnel?
rs = _context.statManager().getRate("tunnel.participatingMessageCountAvgPerTunnel");
r = null;
double messagesPerTunnel = DEFAULT_MESSAGES_PER_TUNNEL_ESTIMATE;
double messagesPerTunnel = 0;
if (rs != null) {
r = rs.getRate(60*1000);
if (r != null)
@@ -345,7 +345,7 @@ public class RouterThrottleImpl implements RouterThrottle {
return TUNNEL_ACCEPT;
}
private static final int DEFAULT_MESSAGES_PER_TUNNEL_ESTIMATE = 40; // .067KBps
static final int DEFAULT_MESSAGES_PER_TUNNEL_ESTIMATE = 40; // .067KBps
/** also limited to 90% - see below */
private static final int MIN_AVAILABLE_BPS = 4*1024; // always leave at least 4KBps free when allowing
private static final String LIMIT_STR = _x("Rejecting tunnels: Bandwidth limit");

2
router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java
View File

@@ -174,7 +174,7 @@ public class TunnelDispatcher implements Service {
// estimate for RouterThrottleImpl
ctx.statManager().createRequiredRateStat("tunnel.participatingMessageCountAvgPerTunnel",
"Estimate of participating messages per tunnel lifetime", "Tunnels",
new long[] { 60*1000l });
new long[] { 60*1000, 20*60*1000 });
ctx.statManager().createRateStat("tunnel.ownedMessageCount",
"How many messages are sent through a tunnel we created (period == failures)?", "Tunnels",
new long[] { 60*1000l, 10*60*1000l, 60*60*1000l });