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

FloodfillMonitorJob: use the 60 min rate avg instead of lifetime avg, but fallback to the lifetime.

Browse Source 
SAMStreamSend: fix tabbing from earlier commit.
This commit is contained in:
dg2-new
2015-02-16 17:27:17 +00:00
parent f41df969b7
commit d4bbdc28f3
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/sam/java/src/net/i2p/sam/client/SAMStreamSend.java
View File

@ -174,7 +174,7 @@ public class SAMStreamSend {
}
public boolean openConnection() {
FileInputStream fin = null;
FileInputStream fin = null;
try {
fin = new FileInputStream(_destFile);
byte dest[] = new byte[1024];

5
router/java/src/net/i2p/router/networkdb/kademlia/FloodfillMonitorJob.java
View File

@ -31,6 +31,7 @@ class FloodfillMonitorJob extends JobImpl {
private static final int REQUEUE_DELAY = 60*60*1000;
private static final long MIN_UPTIME = 2*60*60*1000;
private static final long MIN_CHANGE_DELAY = 6*60*60*1000;
private static final int MIN_FF = 5000;
private static final int MAX_FF = 999999;
private static final String PROP_FLOODFILL_PARTICIPANT = "router.floodfillParticipant";
@ -151,9 +152,9 @@ class FloodfillMonitorJob extends JobImpl {
boolean happy = getContext().router().getRouterInfo().getCapabilities().indexOf("R") >= 0;
// TODO - limit may still be too high
// For reference, the avg lifetime job lag on my Pi is 6.
// Would per-hour or per-day be better than lifetime avg? A reference to avg. dropped ff jobs maybe?
// Should we consider avg. dropped ff jobs?
RateStat lagStat = getContext().statManager().getRate("jobQueue.jobLag");
happy = happy && lagStat.getLifetimeAverageValue() < 25;
happy = happy && lagStat.getRate(60*60*1000L).getAvgOrLifetimeAvg() < 25;
happy = happy && getContext().tunnelManager().getInboundBuildQueueSize() < 5;
// Only if we're pretty well integrated...
happy = happy && _facade.getKnownRouters() >= 200;