-
Notifications
You must be signed in to change notification settings - Fork 39
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 our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Remove OmicronZoneConfig::underlay_address
#6794
Open
jgallagher
wants to merge
17
commits into
main
Choose a base branch
from
john/remove-omicron-zone-config-ip
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
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
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good. Thanks for taking care of this @jgallagher.
I ran e20aab3 through london, both an upgrade from R11 and as a clean-slate RSS, and both worked fine. I'm going to catch up to main and enable automerge on this one. |
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
OmicronZoneType
variant, which themselves carry one (or more than one)SocketAddrV6
whose IP was always expected to match its containingOmicronZoneConfig
'sunderlay_address
, and we had parts ofsled-agent
that 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
OmicronZoneType
instead. The changes tosled-agent/src/services.rs
warrant the closest look, because these were the spots where we were combiningunderlay_address
with 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.