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.

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

feat(enginenetx): implement deterministic+random mixing #1558

Merged
merged 113 commits into from
Apr 17, 2024
Merged

Conversation

bassosimone
Copy link
Contributor

@bassosimone bassosimone commented Apr 17, 2024

We need deterministic+random mixing of HTTPS dial tactics to ensure that we prioritize some tactics coming from the DNS before attempting all the previous tactics, which would make the bootstrap super slow.

Part of ooni/probe#2704.

This diff refactors the code generating tactics to mix bridge and DNS
tactics, such that we avoid trying all bridge tactics before falling
back to DNS tactics. In the event in which the bridge is IP or endpoint
blocked, this change makes sure we try using DNS tactics earlier, and,
if the DNS is working, this means a faster bootstrap.

Based on testing, where I replaced the bridge address with 10.0.0.1, we
try DNS tactics after 8 seconds. After the first run, if the DNS tactics
are working, we would immediately use them before bridge tactics, since
we store information about tactics inside the $OONI_HOME/engine dir.

Part of ooni/probe#2704.
Previously, we were only testing with DNS returning error, while
now we should also have a test case for when it's working given that
we're mixing tactics together now.
Conflicts:
	internal/enginenetx/bridgespolicy_test.go
	internal/enginenetx/statspolicy.go
Conflicts:
	internal/enginenetx/bridgespolicy.go
	internal/enginenetx/httpsdialer.go
	internal/enginenetx/statspolicy.go
@bassosimone bassosimone changed the title Issue/2704h feat(enginenetx): implement deterministic+random mixing Apr 17, 2024
@bassosimone bassosimone marked this pull request as ready for review April 17, 2024 14:41
@bassosimone bassosimone requested a review from hellais as a code owner April 17, 2024 14:41
@bassosimone bassosimone merged commit 7dab5a2 into master Apr 17, 2024
28 checks passed
@bassosimone bassosimone deleted the issue/2704h branch April 17, 2024 15:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant