wgengine/netstack: stop inject goroutine from leaking in Impl.Start (#19721)

This patch fixes a data race in wgengine/netstack that surfaced while
running both TestTCPForwardLimits and TestTCPForwardLimits_PerClient.
Because these two tests both setup the TS_DEBUG_NETSTACK envknob, a
race happens because netstack.Impl.Close leaked its inject goroutine.
The inject goroutine also reads the TS_DEBUG_NETSTACK envknob, so if
it is still running when the next test starts, then it will break.

This patch also cleans up the tests a bit, ensuring that neither of
them run in T.Parallel. It also adds a T.Cleanup call to clear the
envknob.

Fixes #19720

Signed-off-by: Simon Law <sfllaw@tailscale.com>
This commit is contained in:
Simon Law
2026-05-13 08:13:40 -07:00
committed by GitHub
parent 6467f0d067
commit e4e59a2af0
2 changed files with 9 additions and 1 deletions
+4
View File
@@ -737,7 +737,10 @@ func makeHangDialer(tb testing.TB) (netx.DialFunc, chan struct{}) {
// TestTCPForwardLimits verifies that the limits on the TCP forwarder work in a
// success case (i.e. when we don't hit the limit).
func TestTCPForwardLimits(t *testing.T) {
tstest.AssertNotParallel(t) // calls envknob.Setenv
envknob.Setenv("TS_DEBUG_NETSTACK", "true")
t.Cleanup(func() { envknob.Setenv("TS_DEBUG_NETSTACK", "") })
impl := makeNetstack(t, func(impl *Impl) {
impl.ProcessSubnets = true
})
@@ -815,6 +818,7 @@ func TestTCPForwardLimits_PerClient(t *testing.T) {
clientmetric.ResetForTest(t)
tstest.AssertNotParallel(t) // calls envknob.Setenv
envknob.Setenv("TS_DEBUG_NETSTACK", "true")
t.Cleanup(func() { envknob.Setenv("TS_DEBUG_NETSTACK", "") })
// Set our test override limits during this test.
maxInFlightConnectionAttemptsForTest.Store(2)