- Notifications
You must be signed in to change notification settings - Fork1k
fix: use tailscale that avoids small MTU paths#18323
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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes fromall commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
2 changes: 1 addition & 1 deletiongo.mod
This file contains hidden or 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
4 changes: 2 additions & 2 deletionsgo.sum
This file contains hidden or 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
11 changes: 11 additions & 0 deletionstailnet/test/integration/integration.go
This file contains hidden or 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
4 changes: 2 additions & 2 deletionstailnet/test/integration/integration_test.go
This file contains hidden or 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
173 changes: 93 additions & 80 deletionstailnet/test/integration/network.go
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -390,33 +390,38 @@ func createFakeInternet(t *testing.T) fakeInternet { | ||
| } | ||
| type TriangleNetwork struct { | ||
| Client1MTU int | ||
| } | ||
| type fakeTriangleNetwork struct { | ||
| NamePrefix string | ||
| ServerNetNS *os.File | ||
| Client1NetNS *os.File | ||
| Client2NetNS *os.File | ||
| RouterNetNS *os.File | ||
| ServerVethPair vethPair | ||
| Client1VethPair vethPair | ||
| Client2VethPair vethPair | ||
| } | ||
| // SetupNetworking creates multiple namespaces with a central router in the following topology | ||
| // . | ||
| // . ┌──────────────┐ | ||
| // . │ │ | ||
| // . │ Server ├─────────────────────────────────────┐ | ||
| // . │ │fdac:38fa:ffff:3::2 │ | ||
| // . └──────────────┘ │ fdac:38fa:ffff:3::1 | ||
| // . ┌──────────────┐ ┌─────┴───────┐ | ||
| // . │ │ fdac:38fa:ffff:1::1│ │ | ||
| // . │ Client 1 ├───────────────────────────────┤ Router │ | ||
| // . │ │fdac:38fa:ffff:1::2 │ │ | ||
| // . └──────────────┘ └─────┬───────┘ | ||
| // . ┌──────────────┐ │ fdac:38fa:ffff:2::1 | ||
| // . │ │ │ | ||
| // . │ Client 2 ├─────────────────────────────────────┘ | ||
| // . │ │fdac:38fa:ffff:2::2 | ||
| // . └──────────────┘ | ||
| // The veth link between Client 1 and the router has a configurable MTU via Client1MTU. | ||
| func (n TriangleNetwork) SetupNetworking(t *testing.T, l slog.Logger) TestNetworking { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. It's not really a triangle anymore unfortunately, more of a pitchfork 🤣 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. You should redo the diagram to be triforce 🤣 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. Not sure unicode has the correct (60°) diagonals | ||
| logger := l.Named("setup-networking").Leveled(slog.LevelDebug) | ||
| t.Helper() | ||
| @@ -433,101 +438,109 @@ func (n TriangleNetwork) SetupNetworking(t *testing.T, l slog.Logger) TestNetwor | ||
| network.ServerNetNS = createNetNS(t, namePrefix+"server") | ||
| network.Client1NetNS = createNetNS(t, namePrefix+"client1") | ||
| network.Client2NetNS = createNetNS(t, namePrefix+"client2") | ||
| network.RouterNetNS = createNetNS(t, namePrefix+"router") | ||
| // Create veth pair between server androuter | ||
| network.ServerVethPair = vethPair{ | ||
| Outer: namePrefix + "s-r", | ||
| Inner: namePrefix + "r-s", | ||
| } | ||
| err := createVethPair(network.ServerVethPair.Outer, network.ServerVethPair.Inner) | ||
| require.NoErrorf(t, err, "create veth pair %q <-> %q", | ||
| network.ServerVethPair.Outer, network.ServerVethPair.Inner) | ||
| // Move server-router veth ends to their respective namespaces | ||
| err = setVethNetNS(network.ServerVethPair.Outer, int(network.ServerNetNS.Fd())) | ||
| require.NoErrorf(t, err, "set veth %q to server NetNS", network.ServerVethPair.Outer) | ||
| err = setVethNetNS(network.ServerVethPair.Inner, int(network.RouterNetNS.Fd())) | ||
| require.NoErrorf(t, err, "set veth %q torouter NetNS", network.ServerVethPair.Inner) | ||
| // Create veth pair betweenclient1 androuter | ||
| network.Client1VethPair = vethPair{ | ||
| Outer: namePrefix + "1-r", | ||
| Inner: namePrefix + "r-1", | ||
| } | ||
| logger.Debug(context.Background(), "creating client1 link", slog.F("mtu", n.Client1MTU)) | ||
| err = createVethPair(network.Client1VethPair.Outer, network.Client1VethPair.Inner, withMTU(n.Client1MTU)) | ||
| require.NoErrorf(t, err, "create veth pair %q <-> %q", | ||
| network.Client1VethPair.Outer, network.Client1VethPair.Inner) | ||
| // Moveclient1-router veth ends to their respective namespaces | ||
| err = setVethNetNS(network.Client1VethPair.Outer, int(network.Client1NetNS.Fd())) | ||
| require.NoErrorf(t, err, "set veth %q to server NetNS", network.Client1VethPair.Outer) | ||
| err = setVethNetNS(network.Client1VethPair.Inner, int(network.RouterNetNS.Fd())) | ||
| require.NoErrorf(t, err, "set veth %q to client2 NetNS", network.Client1VethPair.Inner) | ||
| // Create veth pair between client1 and client2 | ||
| network.Client2VethPair = vethPair{ | ||
| Outer: namePrefix + "2-r", | ||
| Inner: namePrefix + "r-2", | ||
| } | ||
| err = createVethPair(network.Client2VethPair.Outer, network.Client2VethPair.Inner) | ||
| require.NoErrorf(t, err, "create veth pair %q <-> %q", | ||
| network.Client2VethPair.Outer, network.Client2VethPair.Inner) | ||
| // Move client1-client2 veth ends to their respective namespaces | ||
| err = setVethNetNS(network.Client2VethPair.Outer, int(network.Client2NetNS.Fd())) | ||
| require.NoErrorf(t, err, "set veth %q to client1 NetNS", network.Client2VethPair.Outer) | ||
| err = setVethNetNS(network.Client2VethPair.Inner, int(network.RouterNetNS.Fd())) | ||
| require.NoErrorf(t, err, "set veth %q to client2 NetNS", network.Client2VethPair.Inner) | ||
| // Set IP addresses according to the diagram: | ||
| err = setInterfaceIP6(network.ServerNetNS, network.ServerVethPair.Outer, ula+"3::2") | ||
| require.NoErrorf(t, err, "set IP on server interface") | ||
| err = setInterfaceIP6(network.Client1NetNS, network.Client1VethPair.Outer, ula+"1::2") | ||
| require.NoErrorf(t, err, "set IP on client1 interface") | ||
| err = setInterfaceIP6(network.Client2NetNS, network.Client2VethPair.Outer, ula+"2::2") | ||
| require.NoErrorf(t, err, "set IP on client2 interface") | ||
| err = setInterfaceIP6(network.RouterNetNS, network.ServerVethPair.Inner, ula+"3::1") | ||
| require.NoErrorf(t, err, "set IP on router-server interface") | ||
| err = setInterfaceIP6(network.RouterNetNS, network.Client1VethPair.Inner, ula+"1::1") | ||
| require.NoErrorf(t, err, "set IP on router-client1 interface") | ||
| err = setInterfaceIP6(network.RouterNetNS, network.Client2VethPair.Inner, ula+"2::1") | ||
| require.NoErrorf(t, err, "set IP on router-client2 interface") | ||
| // Bring up all interfaces | ||
| interfaces := []struct { | ||
| netNS *os.File | ||
| ifaceName string | ||
| defaultRoute string | ||
| }{ | ||
| {network.ServerNetNS, network.ServerVethPair.Outer, ula + "3::1"}, | ||
| {network.Client1NetNS, network.Client1VethPair.Outer, ula + "1::1"}, | ||
| {network.Client2NetNS, network.Client2VethPair.Outer, ula + "2::1"}, | ||
| {network.RouterNetNS, network.ServerVethPair.Inner, ""}, | ||
| {network.RouterNetNS, network.Client1VethPair.Inner, ""}, | ||
| {network.RouterNetNS, network.Client2VethPair.Inner, ""}, | ||
| } | ||
| for _, iface := range interfaces { | ||
| err = setInterfaceUp(iface.netNS, iface.ifaceName) | ||
| require.NoErrorf(t, err, "bring up interface %q", iface.ifaceName) | ||
| if iface.defaultRoute != "" { | ||
| err = addRouteInNetNS(iface.netNS, []string{"default", "via", iface.defaultRoute, "dev", iface.ifaceName}) | ||
| require.NoErrorf(t, err, "add peer default route to %s", iface.defaultRoute) | ||
| } | ||
| } | ||
| // enable IP forwarding in the router | ||
| _, err = commandInNetNS(network.RouterNetNS, "sysctl", []string{"-w", "net.ipv6.conf.all.forwarding=1"}).Output() | ||
| require.NoError(t, wrapExitErr(err), "enable IPv6 forwarding in router NetNS") | ||
| return TestNetworking{ | ||
| Server: TestNetworkingServer{ | ||
| Process: TestNetworkingProcess{NetNS: network.ServerNetNS}, | ||
| ListenAddr: "[::]:8080", // Server listens on all IPs | ||
| }, | ||
| Client1: TestNetworkingClient{ | ||
| Process: TestNetworkingProcess{NetNS: network.Client1NetNS}, | ||
| ServerAccessURL: "http://[" + ula + "3::2]:8080", | ||
| }, | ||
| Client2: TestNetworkingClient{ | ||
| Process: TestNetworkingProcess{NetNS: network.Client2NetNS}, | ||
| ServerAccessURL: "http://[" + ula + "3::2]:8080", | ||
| }, | ||
| } | ||
| } | ||
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
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.