From 28c5d6c10d8b32f3aa6276db2b8ecbd3de20089c Mon Sep 17 00:00:00 2001
From: jrandom <jrandom>
Date: Fri, 15 Oct 2004 01:20:12 +0000
Subject: [PATCH] 2004-10-14  jrandom     * Tunnel rejection is no longer a
 sign of an overwhelmingly loaded       peer, so don't use it as a key point
 of the IsFailing calculator.       We still use it as a key point of the
 Capacity calculator, however.

---
 history.txt                                     |  7 ++++++-
 .../java/src/net/i2p/router/RouterVersion.java  |  4 ++--
 .../router/peermanager/IsFailingCalculator.java | 17 ++++++++++-------
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/history.txt b/history.txt
index 805a159a21..a984c613bd 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,9 @@
-$Id: history.txt,v 1.46 2004/10/13 14:40:47 jrandom Exp $
+$Id: history.txt,v 1.47 2004/10/14 15:02:45 jrandom Exp $
+
+2004-10-14  jrandom
+    * Tunnel rejection is no longer a sign of an overwhelmingly loaded
+      peer, so don't use it as a key point of the IsFailing calculator.
+      We still use it as a key point of the Capacity calculator, however.
 
 2004-10-14  jrandom
     * Allow for a configurable tunnel "growth factor", rather than trying
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index ef3b56c0ce..2ff7fdbfb8 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
  *
  */
 public class RouterVersion {
-    public final static String ID = "$Revision: 1.53 $ $Date: 2004/10/13 14:40:47 $";
+    public final static String ID = "$Revision: 1.54 $ $Date: 2004/10/14 15:02:45 $";
     public final static String VERSION = "0.4.1.2";
-    public final static long BUILD = 3;
+    public final static long BUILD = 4;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + VERSION);
         System.out.println("Router ID: " + RouterVersion.ID);
diff --git a/router/java/src/net/i2p/router/peermanager/IsFailingCalculator.java b/router/java/src/net/i2p/router/peermanager/IsFailingCalculator.java
index a810719903..bcb9422d51 100644
--- a/router/java/src/net/i2p/router/peermanager/IsFailingCalculator.java
+++ b/router/java/src/net/i2p/router/peermanager/IsFailingCalculator.java
@@ -46,13 +46,16 @@ public class IsFailingCalculator extends Calculator {
             //    return true;
             //}
             
-            Rate rejectRate = profile.getTunnelHistory().getRejectionRate().getRate(10*60*1000);
-            if (rejectRate.getCurrentEventCount() >= 2) {
-                if (_log.shouldLog(Log.DEBUG))
-                    _log.debug("Peer " + profile.getPeer().toBase64() 
-                               + " is failing because they rejected some tunnels recently");
-                return true;
-            }
+            // this doesn't make sense with probabalistic rejections - we should be
+            // adequately dampening the capacity so these peers aren't queried
+            
+            //Rate rejectRate = profile.getTunnelHistory().getRejectionRate().getRate(10*60*1000);
+            //if (rejectRate.getCurrentEventCount() >= 2) {
+            //    if (_log.shouldLog(Log.DEBUG))
+            //        _log.debug("Peer " + profile.getPeer().toBase64() 
+            //                   + " is failing because they rejected some tunnels recently");
+            //    return true;
+            //}
             
             ////
             // the right way to behave would be to use some statistical