-
Notifications
You must be signed in to change notification settings - Fork 40
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
Use BlueprintZoneConfig
in RSS service plan
#6410
Conversation
In anticipation of adding more `BlueprintZoneConfig` variants with more auxiliary information, we stop converting from `OmicronZoneConfig` to `BlueprintZoneConfig` which is not going to be feasible for much longer. Instead we change the one production code place we do this, RSS, to directly construct `BlueprintZoneConfig` structs rather than do the conversion. This has some ripple effects, and results in a new persistent v4 sled service plan. There is one test that still does this conversion, but the function that does it is now moved into that test module and commented heavily. We hope to remove it shortly.
This is not as daunting as it looks. 1000 lines of it is a generated json file. |
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 great; thanks for cleaning up this mess I left behind.
Out of an abundance of paranoia, have you run through RSS on this branch on london or madrid? (Does a4x2 go through this same code path? I forget when it converges back with normal setup.)
Thanks for the review @jgallagher. Much appreciated.
I did not do that yet. I'll definitely do it before merge. I think the deploy task runs through this, but I'll run it on a4x2, which definitely runs RSS. It just does it from a config file I believe. I always wait for |
I tested on a4x2 and Handoff completed successfully. I see the new |
In anticipation of adding more
BlueprintZoneConfig
variants with more auxiliary information, we stop converting fromOmicronZoneConfig
toBlueprintZoneConfig
which is not going to be feasible for much longer.Instead we change the one production code place we do this, RSS, to directly construct
BlueprintZoneConfig
structs rather than do the conversion.This has some ripple effects, and results in a new persistent v4 sled service plan.
There is one test that still does this conversion, but the function that does it is now moved into that test module and commented heavily. We hope to remove it shortly.