From d4bbdc28f36ba52ee3c66c1cd02ed02051d15ffc Mon Sep 17 00:00:00 2001
From: dg2-new <dg2-new@mail.i2p>
Date: Mon, 16 Feb 2015 17:27:17 +0000
Subject: [PATCH] FloodfillMonitorJob: use the 60 min rate avg instead of
lifetime avg, but fallback to the lifetime. SAMStreamSend: fix tabbing from
earlier commit.
---
apps/sam/java/src/net/i2p/sam/client/SAMStreamSend.java | 2 +-
.../i2p/router/networkdb/kademlia/FloodfillMonitorJob.java | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/apps/sam/java/src/net/i2p/sam/client/SAMStreamSend.java b/apps/sam/java/src/net/i2p/sam/client/SAMStreamSend.java
index 4b9c3eb6c6..a0d82d777e 100644
--- a/apps/sam/java/src/net/i2p/sam/client/SAMStreamSend.java
+++ b/apps/sam/java/src/net/i2p/sam/client/SAMStreamSend.java
@@ -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];
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillMonitorJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillMonitorJob.java
index 3312ab7d57..a378599d05 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillMonitorJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillMonitorJob.java
@@ -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;
--
GitLab