Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: only log errors when the time was invalid in 1497, too #1035

Merged
merged 2 commits into from
Feb 16, 2025
Merged

Fix: only log errors when the time was invalid in 1497, too #1035

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d41b7d
Fix: only log errors when the time was invalid in 1497, too
ArneBab Jan 27, 2025
84bb9c2
fix: check correct variable, avoid unnecessary checks.
ArneBab Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/freenet/node/FailureTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,13 @@ public void shouldUpdate(){
* Maximum time for any FailureTable i.e. for this period after a DNF, we will avoid the node that
* DNFed. */
static final long REJECT_TIME = MINUTES.toMillis(3);
static final long REJECT_TIME_BEFORE_BUILD_1498 = MINUTES.toMillis(5);
/** Maximum time for a RecentlyFailed. I.e. until this period expires, we take a request into account
* when deciding whether we have recently failed to this peer. If we get a DNF, we use this figure.
* If we get a RF, we use what it tells us, which can be less than this. Most other failures use
* shorter periods. */
static final long RECENTLY_FAILED_TIME = MINUTES.toMillis(5);
static final long RECENTLY_FAILED_TIME_BEFORE_BUILD_1498 = MINUTES.toMillis(30);
/** After 1 hour we forget about an entry completely */
static final long MAX_LIFETIME = MINUTES.toMillis(60);
/** Offers expire after 10 minutes */
Expand Down Expand Up @@ -115,12 +117,15 @@ public void start() {
*/
public void onFailed(Key key, PeerNode routedTo, short htl, long rfTimeout, long ftTimeout) {
if(ftTimeout < 0 || ftTimeout > REJECT_TIME) {
Logger.error(this, "Bogus timeout "+ftTimeout, new Exception("error"));
if (ftTimeout > REJECT_TIME_BEFORE_BUILD_1498) { // only log an error if the time is invalid for 1497, too
Logger.error(this, "Bogus timeout "+ftTimeout, new Exception("error"));
}
ftTimeout = Math.max(Math.min(REJECT_TIME, ftTimeout), 0);
}
if(rfTimeout < 0 || rfTimeout > RECENTLY_FAILED_TIME) {
if(rfTimeout > 0)
if(rfTimeout > RECENTLY_FAILED_TIME_BEFORE_BUILD_1498) { // only log an error if the time is invalid for 1497, too
Logger.error(this, "Bogus timeout "+rfTimeout, new Exception("error"));
}
rfTimeout = Math.max(Math.min(RECENTLY_FAILED_TIME, rfTimeout), 0);
}
if(!(node.isEnableULPRDataPropagation() || node.isEnablePerNodeFailureTables())) return;
Expand Down
Loading