NetDB: Reduce max job lag for floodfill, was far too high

This commit is contained in:
zzz
2015-02-06 00:51:32 +00:00
parent e431be2cbe
commit b9197e35b5
3 changed files with 19 additions and 3 deletions

View File

@@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 20;
public final static long BUILD = 21;
/** for example "-test" */
public final static String EXTRA = "";

View File

@@ -149,8 +149,9 @@ class FloodfillMonitorJob extends JobImpl {
ffcount++;
int good = ffcount - failcount;
boolean happy = getContext().router().getRouterInfo().getCapabilities().indexOf("R") >= 0;
// Use the same job lag test as in RouterThrottleImpl
happy = happy && getContext().jobQueue().getMaxLag() < 2*1000;
// TODO - limit may still be too high
// TODO - use jobQueue.jobLag stat instead?
happy = happy && getContext().jobQueue().getMaxLag() < 100;
// Only if we're pretty well integrated...
happy = happy && _facade.getKnownRouters() >= 200;
happy = happy && getContext().commSystem().countActivePeers() >= 50;