From 99681e1d1e9cede47c02f2e4701bdbef42b33346 Mon Sep 17 00:00:00 2001 From: zzz <zzz@mail.i2p> Date: Sun, 26 Aug 2012 12:47:31 +0000 Subject: [PATCH] * NetDB: Increase floodfills, decrease flood redundancy --- .../router/networkdb/kademlia/FloodfillMonitorJob.java | 2 +- .../kademlia/FloodfillNetworkDatabaseFacade.java | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) 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 4a84b3518e..9e05ff9ae8 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillMonitorJob.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillMonitorJob.java @@ -25,7 +25,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 = 250; + private static final int MIN_FF = 300; private static final int MAX_FF = 999999; private static final String PROP_FLOODFILL_PARTICIPANT = "router.floodfillParticipant"; diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java index 29294e43b9..05373c385d 100644 --- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java +++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillNetworkDatabaseFacade.java @@ -33,6 +33,13 @@ public class FloodfillNetworkDatabaseFacade extends KademliaNetworkDatabaseFacad private final Set<Hash> _verifiesInProgress; private FloodThrottler _floodThrottler; private LookupThrottler _lookupThrottler; + + /** + * This is the flood redundancy. Entries are + * sent to this many other floodfills. + * Was 7 through release 0.9; 5 for 0.9.1. + */ + private static final int MAX_TO_FLOOD = 4; public FloodfillNetworkDatabaseFacade(RouterContext context) { super(context); @@ -156,8 +163,6 @@ public class FloodfillNetworkDatabaseFacade extends KademliaNetworkDatabaseFacad return _lookupThrottler.shouldThrottle(from, id); } - private static final int MAX_TO_FLOOD = 5; - /** * Send to a subset of all floodfill peers. * We do this to implement Kademlia within the floodfills, i.e. -- GitLab