Remove OmicronZoneConfig::underlay_address
#6794
Draft
Conversation
This file contains 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
andrewjstone
approved these changes
Oct 8, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This field (an IP only, no port) was effectively duplicated by every
OmicronZoneTypevariant, which themselves carry one (or more than one)SocketAddrV6whose IP was always expected to match its containingOmicronZoneConfig'sunderlay_address, and we had parts ofsled-agentthat was relying on that fact.This is purely a cleanup PR that removes the field. Most of the changes here are mechanical: removing the field and instead using the socket address from within
OmicronZoneTypeinstead. The changes tosled-agent/src/services.rswarrant the closest look, because these were the spots where we were combiningunderlay_addresswith constant port numbers and ignoring the full socket address.(We're still constructing socket addresses via constant port numbers for some zone types that run multiple servers on different ports; these are all markedFiled #6796TODO-john, and I'll update those comments to refer to a new issue shortly.)I'm marking this as a draft both because it's a change to a fairly fundamental sled-agent type that I'd like to test on real hardware before merging, and because it should land after we cut R11. But this passes CI and a4x2, so I believe it's ready for review despite its draft status.
Fixes #6651.