Fix: only log errors when the time was invalid in 1497, too #1035
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Creating backtraces isn’t free and a user reported that they see a lot of these errors in the log. But the behavior is expected if you’re connected to a node with build 1497 or earlier.
Bombe
reviewed
Jan 27, 2025
src/freenet/node/FailureTable.java
Outdated
| @@ -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 > 0 && rfTimeout > REJECT_TIME_BEFORE_BUILD_1498) { // only log an error if the time is invalid for 1497, too | |||
There was a problem hiding this comment.
This checks both ftTimeout and rfTimeout, is that okay?
There was a problem hiding this comment.
No, that’s not ok … fixed.
src/freenet/node/FailureTable.java
Outdated
| ftTimeout = Math.max(Math.min(REJECT_TIME, ftTimeout), 0); | ||
| } | ||
| if(rfTimeout < 0 || rfTimeout > RECENTLY_FAILED_TIME) { | ||
| if(rfTimeout > 0) | ||
| if(rfTimeout > 0 && rfTimeout > RECENTLY_FAILED_TIME_BEFORE_BUILD_1498) { // only log an error if the time is invalid for 1497, too |
There was a problem hiding this comment.
If rfTimeout is largen than RECENTLY_FAILED_TIME_BEFORE_BUILD_1498, it should also be larger than 0, should it not?
There was a problem hiding this comment.
Yes it should — two unnecessary comparisons removed. Thank you!
Thanks to Bombe!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Creating backtraces isn’t free and a user reported that they see a lot of these errors in the log. But the behavior is expected if you’re connected to a node with build 1497 or earlier.