[meta] remove remaining uses of IdMap + IdMap itself#9391
Merged
sunshowers merged 2 commits intomainfrom Nov 13, 2025
Merged
Conversation
Created using spr 1.3.6-beta.1
Created using spr 1.3.6-beta.1
jgallagher
approved these changes
Nov 13, 2025
Contributor
Thanks for doing the considerably-more-involved work to allow borrowable keys and get |
sunshowers
deleted the
sunshowers/spr/meta-remove-remaining-uses-of-idmap-idmap-itself
branch
jgallagher
added a commit
that referenced
this pull request
Nov 18, 2025
) This is mostly a refactor of how RSS generates the blueprint it hands off to Nexus. At the point we need to construct a blueprint, we have a `ServicePlan` and a `SledPlan` (both renamed imports from `Plan` structs in other modules). We have to combine these to construct the blueprint: `ServicePlan` contains all the sled configs but not the sled IDs, and `SledPlan` contains all the sled IDs. Both contained maps keyed by each sled's underlay address, so constructing a blueprint was a two step process: * Call `build_sled_configs_by_id(sled_plan, service_plan)` to match up the two maps via sled underlay addresses, producing a single map containing both sled IDs and sled configs * Pass that combined map into a helper function that actually constructed the blueprint However, this is largely unnecessary: `ServicePlan` did originally know all the sled IDs too - it just threw that information away. This PR changes `ServicePlan` to keep track of the sled IDs also, removing the need to join it against `SledPlan` later. The helper function that constructs a blueprint is now a `to_blueprint()` method on `ServicePlan` itself. (The motivator for this change is that I want to add some additional fields to `BlueprintSledConfig` that are also available to `ServicePlan`, and doing so is a lot easier if we already have this refactor in place.) There should be no behavioral changes in this PR, except for an extra small change that snuck in while I was here: Previously, RSS was asking each sled for its inventory and then separately asking for its role (i.e., scrimlet vs gimlet). But at some point we added the role to the inventory, so this PR removes the `get_sled_role` endpoint altogether, and RSS reads the role from the inventory it just fetched. (I did double check that the `inventory` and `get_sled_role` handlers read from exactly the same bit of information to determine the sled's role.) This is staged on top of #9391 to avoid merge conflicts touching some of these same bits.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Thanks so much to @jgallagher for building id-map and establishing how useful this pattern is ❤️
The test failures are addressed by #9392.