Author: toad
Date: 2005-11-24 21:21:33 +0000 (Thu, 24 Nov 2005)
New Revision: 7587
Modified:
trunk/freenet/src/freenet/node/InsertSender.java
trunk/freenet/src/freenet/node/RequestSender.java
trunk/freenet/src/freenet/node/Version.java
Log:
207:
Fix stats glitch.
Modified: trunk/freenet/src/freenet/node/InsertSender.java
===================================================================
--- trunk/freenet/src/freenet/node/InsertSender.java 2005-11-24 20:57:50 UTC
(rev 7586)
+++ trunk/freenet/src/freenet/node/InsertSender.java 2005-11-24 21:21:33 UTC
(rev 7587)
@@ -209,12 +209,14 @@
// Fairly serious problem
Logger.error(this, "Timeout after Accepted in insert");
// Treat as rejected-overload
+ next.insertRejectedOverload();
finish(REJECTED_OVERLOAD, next);
return;
}
if(msg.getSpec() == DMT.FNPRejectedOverload || msg.getSpec() ==
DMT.FNPRejectedTimeout) {
Logger.minor(this, "Rejected due to overload");
+ next.insertRejectedOverload();
finish(REJECTED_OVERLOAD, next);
return;
}
@@ -223,10 +225,13 @@
Logger.minor(this, "Rejected: RNF");
short newHtl = msg.getShort(DMT.HTL);
if(htl > newHtl) htl = newHtl;
+ // Finished as far as this node is concerned
+ next.insertDidNotRejectOverload();
continue;
}
if(msg.getSpec() == DMT.FNPDataInsertRejected) {
+ next.insertDidNotRejectOverload();
short reason = msg.getShort(DMT.DATA_INSERT_REJECTED_REASON);
Logger.minor(this, "DataInsertRejected: "+reason);
@@ -274,6 +279,7 @@
}
// Our task is complete
+ next.insertDidNotRejectOverload();
finish(SUCCESS, next);
return;
}
@@ -320,12 +326,8 @@
if(status == REJECTED_OVERLOAD) {
node.getInsertThrottle().requestRejectedOverload();
- if(next != null)
- next.insertRejectedOverload();
} else if(status == SUCCESS || status == ROUTE_NOT_FOUND) {
node.getInsertThrottle().requestCompleted(System.currentTimeMillis() -
startTime);
- if(next != null)
- next.insertDidNotRejectOverload();
}
synchronized(this) {
Modified: trunk/freenet/src/freenet/node/RequestSender.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestSender.java 2005-11-24 20:57:50 UTC
(rev 7586)
+++ trunk/freenet/src/freenet/node/RequestSender.java 2005-11-24 21:21:33 UTC
(rev 7587)
@@ -151,11 +151,13 @@
if(msg == null) {
// Timeout
// Treat as FNPRejectOverloadd
+ next.rejectedOverload();
finish(REJECTED_OVERLOAD, next);
return;
}
if(msg.getSpec() == DMT.FNPRejectedLoop) {
+ next.didNotRejectOverload();
// Find another node to route to
continue;
}
@@ -163,6 +165,7 @@
if(msg.getSpec() == DMT.FNPRejectedOverload) {
// Failed. Propagate back to source.
// Source will reduce send rate.
+ next.rejectedOverload();
finish(REJECTED_OVERLOAD, next);
return;
}
@@ -191,6 +194,7 @@
}
if(msg.getSpec() == DMT.FNPDataNotFound) {
+ next.didNotRejectOverload();
finish(DATA_NOT_FOUND, next);
return;
}
@@ -199,15 +203,18 @@
// Backtrack within available hops
short newHtl = msg.getShort(DMT.HTL);
if(newHtl < htl) htl = newHtl;
+ next.didNotRejectOverload();
continue;
}
if(msg.getSpec() == DMT.FNPRejectedOverload) {
+ next.rejectedOverload();
finish(REJECTED_OVERLOAD, next);
return;
}
// Found data
+ next.didNotRejectOverload();
// First get headers
@@ -303,12 +310,8 @@
if(status == REJECTED_OVERLOAD) {
node.getRequestThrottle().requestRejectedOverload();
- if(next != null)
- next.rejectedOverload();
} else if(status == SUCCESS || status == ROUTE_NOT_FOUND || status ==
DATA_NOT_FOUND || status == VERIFY_FAILURE) {
node.getRequestThrottle().requestCompleted(System.currentTimeMillis() -
startTime);
- if(next != null)
- next.didNotRejectOverload();
}
synchronized(this) {
Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2005-11-24 20:57:50 UTC (rev
7586)
+++ trunk/freenet/src/freenet/node/Version.java 2005-11-24 21:21:33 UTC (rev
7587)
@@ -20,10 +20,10 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- public static final int buildNumber = 206;
+ public static final int buildNumber = 207;
/** Oldest build of Fred we will talk to */
- public static final int lastGoodBuild = 206;
+ public static final int lastGoodBuild = 207;
/** The highest reported build of fred */
public static int highestSeenBuild = buildNumber;
