[sled-agent] Report boot partition contents of M.2 drives in inventory (PR 2/2) #8451
Conversation
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
|
From testing on After uploading this same commit's TUF repo, we can confirm that the artifact hash and size is correct, and that it's been distributed to every sled: |
jgallagher
force-pushed
the
john/config-reconciler-report-phase2
branch
from
7777e64 to
325544c
Compare
andrewjstone
approved these changes
Jul 3, 2025
| -- Move any non-NULL `last_reconciled_config` values out of `inv_sled_agent` | ||
| -- and into new rows in `inv_sled_config_reconciler`. We fill in the rest of the | ||
| -- columns with dummy errors for old collections that don't have data. | ||
| INSERT INTO omicron.public.inv_sled_config_reconciler ( |
| @@ -2505,6 +2505,151 @@ fn after_155_0_0<'a>(ctx: &'a MigrationContext<'a>) -> BoxFuture<'a, ()> { | |||
| }) | |||
| } | |||
|
|
|||
| mod migration_156 { | |||
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 is stacked on top of #8450. It adds a
BootPartitionContentsstructure to the inventory reported by the sled-agent-config-reconciler which contains:each of which is a
Resultin case we failed to determine any of those three items. In practice, I'd expect us to basically never fail to report which slot we booted from, and to only fail on the contents of a slot if that slot doesn't have a valid phase 2 image in it.Almost all of the changes here are related to updating the db schema to store this new information (and updating the queries to insert/read/delete the new tables).
up3.sqlis worth a particularly close look, because we've moved a field out ofinv_sled_agentand into a new table, so that part of the migration attempts to ensure we create rows in the new table for each row ininv_sled_agentthat had a value for that field. There's a data migration test that covers this.