Skip to content

Retry dual-era backend startup on a lost port-bind race #6080

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.

Sign up for GitHub

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

Merged
JAORMX merged 1 commit into from
Jul 28, 2026
Merged

Retry dual-era backend startup on a lost port-bind race #6080

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 26 additions & 6 deletions test/e2e/vmcp_dual_era_helpers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,32 @@ func launchYardstickLegacyOnPort(config *e2e.TestConfig, groupName, backendName
).ExpectSuccess()
}

// startEraBackendOnPort launches a backend via launch and waits for it to
// become ready, retrying once with a freshly allocated port if the container
// lost a race binding its host port. allocateVMCPPort only probes that a port
// is free at call time and closes its own listener immediately -- the actual
// bind happens later, asynchronously, inside the container Docker starts for
// the detached `thv run` process, so another workload's container can grab
// the same ephemeral port in between (observed as "address already in use").
func startEraBackendOnPort(config *e2e.TestConfig, backendName string, port int, launch func(port int)) {
launch(port)
err := e2e.WaitForMCPServer(config, backendName, 120*time.Second)
if err != nil && strings.Contains(err.Error(), "address already in use") {
GinkgoWriter.Printf("%s lost a port-bind race on %d, retrying with a fresh port: %v\n", backendName, port, err)
e2e.NewTHVCommand(config, "rm", backendName).ExpectSuccess()
port = allocateVMCPPort()
launch(port)
err = e2e.WaitForMCPServer(config, backendName, 120*time.Second)
}
Expect(err).ToNot(HaveOccurred(), fmt.Sprintf("yardstick backend %q should become running", backendName))
}

// startYardstickLegacyOnPort runs launchYardstickLegacyOnPort and waits for
// the backend to become ready.
func startYardstickLegacyOnPort(config *e2e.TestConfig, groupName, backendName string, port int) {
launchYardstickLegacyOnPort(config, groupName, backendName, port)
err := e2e.WaitForMCPServer(config, backendName, 120*time.Second)
Expect(err).ToNot(HaveOccurred(), fmt.Sprintf("legacy yardstick backend %q should become running", backendName))
startEraBackendOnPort(config, backendName, port, func(p int) {
launchYardstickLegacyOnPort(config, groupName, backendName, p)
})
}

// launchYardstickModernOnPort starts a stateless (Modern-capable) yardstick
Expand Down Expand Up @@ -87,9 +107,9 @@ func launchYardstickModernOnPort(config *e2e.TestConfig, groupName, backendName
// startYardstickModernOnPort runs launchYardstickModernOnPort and waits for
// the backend to become ready.
func startYardstickModernOnPort(config *e2e.TestConfig, groupName, backendName string, port int) {
launchYardstickModernOnPort(config, groupName, backendName, port)
err := e2e.WaitForMCPServer(config, backendName, 120*time.Second)
Expect(err).ToNot(HaveOccurred(), fmt.Sprintf("modern yardstick backend %q should become running", backendName))
startEraBackendOnPort(config, backendName, port, func(p int) {
launchYardstickModernOnPort(config, groupName, backendName, p)
})
}

// healthCheckConfigYAML is appended to a `thv vmcp init`-generated config file
Expand Down
Loading