Skip to content

[test-utils] use a TCP proxy to keep dpd port bound across restarts#10726

Merged
sunshowers merged 2 commits into
mainfrom
sunshowers/spr/test-utils-use-a-tcp-proxy-to-keep-dpd-port-bound-across-restarts
Jul 2, 2026
Merged

[test-utils] use a TCP proxy to keep dpd port bound across restarts#10726
sunshowers merged 2 commits into
mainfrom
sunshowers/spr/test-utils-use-a-tcp-proxy-to-keep-dpd-port-bound-across-restarts

Conversation

@sunshowers

@sunshowers sunshowers commented Jul 2, 2026

Copy link
Copy Markdown
Contributor

In #10697 we saw occasional failures where other tests would end up binding a port. Avoid that by using a TCP proxy in the middle, which keeps the port bound throughout.

Also do some other cleanups like using consuming methods and combining the running and stopped dendrite maps.

This should fix #10697 but I'll leave that open until we don't see this test be flaky any more for a few days.

TODO:

  • After landing this, add to flake-patterns.adoc.

Created using spr 1.3.6-beta.1
Created using spr 1.3.6-beta.1

@jgallagher jgallagher left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great!

Comment thread docs/flake-patterns.adoc

**Example commits:**

* https://github.com/oxidecomputer/omicron/commit/AAAAA[`AAAAA`] introduces the TCP proxy.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you want to link to this PR to avoid having to update it after it lands?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've generally been linking to commit hashes so that automated tools like Claude can just git/jj show them and not have to reach out to the network.

@sunshowers sunshowers merged commit 1a15291 into main Jul 2, 2026
19 checks passed
@sunshowers sunshowers deleted the sunshowers/spr/test-utils-use-a-tcp-proxy-to-keep-dpd-port-bound-across-restarts branch July 2, 2026 16:44
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.

test failed in CI: omicron-nexus app::sagas::instance_update::test::migration_update_can_complete_with_dead_switch

2 participants