fix(iroh-net): Ensure netcheck finishes once it has results #2027
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
Once netcheck has managed to establish an external IP address there is no need to further wait on the portmapper. The results are already useful. If later the portmapper manages to get something done the magicsock will react to that and make use of it.
dignifiedquire
approved these changes
Feb 15, 2024
| /// This is set to true in tests to avoid probing the local LAN's router etc. | ||
| /// | ||
| /// TODO: currently this only skips the portmapper, but still does STUN, HTTP and ICMP | ||
| /// probes. Furthermore none of our tests actually use this feature. |
There was a problem hiding this comment.
honestly, just delete it, we can bring it back if we ever need to
There was a problem hiding this comment.
yeah, fair enough. i'll do that in a separate PR though.
|
Pinging @divagant-martian to check my understanding of the portmapper is correct. I think what happens is that on the very first netcheck the portmapper has not yet run to completion and that slows down the first netcheck, often only to not get a portmapper result anyway. Later on there are cached reports that are returned. As all this is reporting is a bunch of bools in an option I think it's fine to not wait for this the first time. |
Testing it is pretty hard, things still seem to work though. And I'm pretty sure this is the path that failed when looking at the logs where the problem was reported. |
|
@divagant-martian I'm going to interpret the thumbs-up as approval. Can always revert if that was wrong. |
3 tasks
github-merge-queue bot
pushed a commit
that referenced
this pull request
Feb 19, 2024
## Description We were incorrectly identifying globally routable IPv6 addresses as not routable. This make netcheck skip IPv6 addresses. ## Notes & open questions Closes #2022 The fix in the netcheck, test is curious, it fails on this PR fairly consistently yet it is really a flaky test introduced in combination with #2027. Now that we have IPv6 resolving properly we might get an IPv6 result. Since this test only has a single DerpUrl it only needs one result to complete. This could be an IPv4 OR an IPv6 result, we don't know which one will be faster. And if the other is slow enough then it won't be received. I think this behaviour is fine, we simply can't guarantee that both must have a result and the point of netcheck is to return something working quickly. ## Change checklist - [x] Self-review. - [x] Documentation updates if relevant. - [x] Tests if relevant.
fubuloubu
pushed a commit
to ApeWorX/iroh
that referenced
this pull request
Feb 21, 2024
…ter#2027) ## Description Once netcheck has managed to establish an external IP address there is no need to further wait on the portmapper. The results are already useful. If later the portmapper manages to get something done the magicsock will react to that and make use of it. ## Notes & open questions Fixes n0-computer#2021 ## Change checklist - [x] Self-review. - [x] Documentation updates if relevant. - [x] Tests if relevant.
fubuloubu
pushed a commit
to ApeWorX/iroh
that referenced
this pull request
Feb 21, 2024
…computer#2030) ## Description We were incorrectly identifying globally routable IPv6 addresses as not routable. This make netcheck skip IPv6 addresses. ## Notes & open questions Closes n0-computer#2022 The fix in the netcheck, test is curious, it fails on this PR fairly consistently yet it is really a flaky test introduced in combination with n0-computer#2027. Now that we have IPv6 resolving properly we might get an IPv6 result. Since this test only has a single DerpUrl it only needs one result to complete. This could be an IPv4 OR an IPv6 result, we don't know which one will be faster. And if the other is slow enough then it won't be received. I think this behaviour is fine, we simply can't guarantee that both must have a result and the point of netcheck is to return something working quickly. ## Change checklist - [x] Self-review. - [x] Documentation updates if relevant. - [x] Tests if relevant.
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.
Description
Once netcheck has managed to establish an external IP address there is
no need to further wait on the portmapper. The results are already
useful. If later the portmapper manages to get something done the
magicsock will react to that and make use of it.
Notes & open questions
Fixes #2021
Change checklist