Skip to content

(7/N) Use nexus_generation, update it #8936

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.

Sign up for GitHub

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

Open
wants to merge 26 commits into
base: main
Choose a base branch
from
Open

(7/N) Use nexus_generation, update it #8936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
38a265b
(4/N) db_metadata_nexus database queries (handoff)
smklein Aug 27, 2025
3e61a97
(5/N) Read database access records on boot
smklein Aug 27, 2025
e1b43c3
(6/N) Add image to planning report for zones
smklein Aug 27, 2025
6b7e9ed
(7/N) Use nexus_generation, update it
smklein Aug 27, 2025
db263c1
Merge with main
smklein Sep 3, 2025
bbb204c
drop keys for InlineErrorChain
smklein Sep 3, 2025
67505ec
Merge
smklein Sep 4, 2025
e1f2fe1
Merge
smklein Sep 4, 2025
529874d
update nexus internal API
smklein Sep 4, 2025
961338c
Actually create NotYet records when appropriate
smklein Sep 4, 2025
fed7aa0
Merge with main
smklein Sep 4, 2025
bf79e74
Merge
smklein Sep 5, 2025
51b3103
Merge
smklein Sep 5, 2025
9514deb
Fix database_nexus_access_create to use active Nexus
smklein Sep 5, 2025
ce31570
Make clippy happy
smklein Sep 5, 2025
70d4ab9
Simplify database_nexus_access_create, move tests
smklein Sep 5, 2025
690ea16
Unify queries for all db_metadata_nexus states
smklein Sep 8, 2025
f15fa4b
comments, enums, set_..._nexuses
smklein Sep 8, 2025
5525529
determine_nexus_generation no longer returns an option
smklein Sep 9, 2025
c8126af
maybe when we say the gen bumps, we should do that
smklein Sep 9, 2025
056829f
merge
smklein Sep 9, 2025
e3615a9
merge
smklein Sep 9, 2025
a38a811
move some generation checks out of planner, into blippy
smklein Sep 9, 2025
b4bcca7
get_zones_not_yet_propagated_to_inventory comments
smklein Sep 10, 2025
a6548ca
clarifying planner comments
smklein Sep 10, 2025
448a39d
proposed
smklein Sep 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dev-tools/reconfigurator-cli/tests/output/cmds-example-stdout
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ T ENA ID PARENT
> blueprint-plan ade5749d-bdf3-4fab-a8ae-00bea01b3a5a
INFO skipping noop image source check for all sleds, reason: no target release is currently set
WARN cannot issue more MGS-driven updates (no current artifacts)
INFO some zones not yet up-to-date, sled_id: 89d02b1b-478c-401a-8e28-7a26f74fa41b, zones_currently_updating: [ZoneCurrentlyUpdating { zone_id: b3c9c041-d2f0-4767-bdaf-0e52e9d7a013 (service), zone_kind: InternalNtp, reason: MissingInInventory { bp_image_source: InstallDataset } }]
INFO some zones not yet up-to-date, zones_currently_updating: [ZonePropagationIncomplete { zone_id: b3c9c041-d2f0-4767-bdaf-0e52e9d7a013 (service), zone_kind: InternalNtp, reason: MissingInInventory { bp_image_source: InstallDataset } }]
generated blueprint 86db3308-f817-4626-8838-4085949a6a41 based on parent blueprint ade5749d-bdf3-4fab-a8ae-00bea01b3a5a
planning report for blueprint 86db3308-f817-4626-8838-4085949a6a41:
* discretionary zone placement waiting for NTP zones on sleds: 89d02b1b-478c-401a-8e28-7a26f74fa41b
Expand Down
4 changes: 2 additions & 2 deletions dev-tools/reconfigurator-cli/tests/output/cmds-expunge-newly-added-external-dns-stdout
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -843,7 +843,7 @@ WARN cannot issue more MGS-driven updates (no current artifacts)
generated blueprint 9c998c1d-1a7b-440a-ae0c-40f781dea6e2 based on parent blueprint 366b0b68-d80e-4bc1-abd3-dc69837847e0
planning report for blueprint 9c998c1d-1a7b-440a-ae0c-40f781dea6e2:
* discretionary zones placed:
* 1 zone on sled 711ac7f8-d19e-4572-bdb9-e9b50f6e362a: external_dns
* external_dns zone on sled 711ac7f8-d19e-4572-bdb9-e9b50f6e362a from source install dataset
* zone updates waiting on discretionary zones


Expand Down Expand Up @@ -1340,7 +1340,7 @@ parent: 366b0b68-d80e-4bc1-abd3-dc69837847e0

planning report for blueprint 9c998c1d-1a7b-440a-ae0c-40f781dea6e2:
* discretionary zones placed:
* 1 zone on sled 711ac7f8-d19e-4572-bdb9-e9b50f6e362a: external_dns
* external_dns zone on sled 711ac7f8-d19e-4572-bdb9-e9b50f6e362a from source install dataset
* zone updates waiting on discretionary zones


Expand Down
2 changes: 1 addition & 1 deletion dev-tools/reconfigurator-cli/tests/output/cmds-expunge-newly-added-internal-dns-stdout
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,7 @@ WARN cannot issue more MGS-driven updates (no current artifacts)
generated blueprint af934083-59b5-4bf6-8966-6fb5292c29e1 based on parent blueprint 58d5e830-0884-47d8-a7cd-b2b3751adeb4
planning report for blueprint af934083-59b5-4bf6-8966-6fb5292c29e1:
* discretionary zones placed:
* 1 zone on sled 2b8f0cb3-0295-4b3c-bc58-4fe88b57112c: internal_dns
* internal_dns zone on sled 2b8f0cb3-0295-4b3c-bc58-4fe88b57112c from source install dataset
* zone updates waiting on discretionary zones


Expand Down
18 changes: 17 additions & 1 deletion dev-tools/reconfigurator-cli/tests/output/cmds-mupdate-update-flow-stdout
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,6 +508,7 @@ planning report for blueprint a5a8f242-ffa5-473c-8efd-2acf2dc0b736:
- sleds have remove mupdate override set in blueprint: 98e6b7c2-2efa-41ca-b20a-0a4d61102fe6, d81c6a84-79b8-4958-ae41-ea46c9b19763
- sleds have mupdate override errors: 2b8f0cb3-0295-4b3c-bc58-4fe88b57112c
* zone updates waiting on zone add blockers
* waiting to update top-level nexus_generation: pending non-nexus zone updates



Expand Down Expand Up @@ -779,6 +780,7 @@ planning report for blueprint 626487fa-7139-45ec-8416-902271fc730b:
- sleds have remove mupdate override set in blueprint: 98e6b7c2-2efa-41ca-b20a-0a4d61102fe6, d81c6a84-79b8-4958-ae41-ea46c9b19763
- sleds have mupdate override errors: 2b8f0cb3-0295-4b3c-bc58-4fe88b57112c
* zone updates waiting on zone add blockers
* waiting to update top-level nexus_generation: pending non-nexus zone updates


> blueprint-diff latest
Expand Down Expand Up @@ -903,6 +905,7 @@ planning report for blueprint c1a0d242-9160-40f4-96ae-61f8f40a0b1b:
- sleds have remove mupdate override set in blueprint: d81c6a84-79b8-4958-ae41-ea46c9b19763
- sleds have mupdate override errors: 2b8f0cb3-0295-4b3c-bc58-4fe88b57112c
* zone updates waiting on zone add blockers
* waiting to update top-level nexus_generation: pending non-nexus zone updates



Expand Down Expand Up @@ -1088,6 +1091,7 @@ planning report for blueprint afb09faf-a586-4483-9289-04d4f1d8ba23:
- current target release generation (3) is lower than minimum required by blueprint (4)
- sleds have mupdate override errors: 2b8f0cb3-0295-4b3c-bc58-4fe88b57112c
* zone updates waiting on zone add blockers
* waiting to update top-level nexus_generation: pending non-nexus zone updates


> blueprint-show latest
Expand Down Expand Up @@ -1263,6 +1267,7 @@ planning report for blueprint afb09faf-a586-4483-9289-04d4f1d8ba23:
- current target release generation (3) is lower than minimum required by blueprint (4)
- sleds have mupdate override errors: 2b8f0cb3-0295-4b3c-bc58-4fe88b57112c
* zone updates waiting on zone add blockers
* waiting to update top-level nexus_generation: pending non-nexus zone updates



Expand Down Expand Up @@ -1401,6 +1406,7 @@ planning report for blueprint ce365dff-2cdb-4f35-a186-b15e20e1e700:
* zone adds and updates are blocked:
- sleds have mupdate override errors: 2b8f0cb3-0295-4b3c-bc58-4fe88b57112c
* zone updates waiting on zone add blockers
* waiting to update top-level nexus_generation: pending non-nexus zone updates


> blueprint-show latest
Expand Down Expand Up @@ -1576,6 +1582,7 @@ planning report for blueprint ce365dff-2cdb-4f35-a186-b15e20e1e700:
* zone adds and updates are blocked:
- sleds have mupdate override errors: 2b8f0cb3-0295-4b3c-bc58-4fe88b57112c
* zone updates waiting on zone add blockers
* waiting to update top-level nexus_generation: pending non-nexus zone updates



Expand Down Expand Up @@ -1691,7 +1698,9 @@ planning report for blueprint 8f2d1f39-7c88-4701-aa43-56bf281b28c1:
* skipping noop zone image source check on sled d81c6a84-79b8-4958-ae41-ea46c9b19763: all 6 zones are already from artifacts
* 1 pending MGS update:
* model0:serial0: RotBootloader(PendingMgsUpdateRotBootloaderDetails { expected_stage0_version: ArtifactVersion("0.0.1"), expected_stage0_next_version: NoValidVersion })
* only placed 0/2 desired nexus zones
* zone updates waiting on pending MGS updates (RoT / SP / Host OS / etc.)
* waiting to update top-level nexus_generation: pending non-nexus zone updates


> blueprint-show latest
Expand Down Expand Up @@ -1871,7 +1880,9 @@ planning report for blueprint 8f2d1f39-7c88-4701-aa43-56bf281b28c1:
* skipping noop zone image source check on sled d81c6a84-79b8-4958-ae41-ea46c9b19763: all 6 zones are already from artifacts
* 1 pending MGS update:
* model0:serial0: RotBootloader(PendingMgsUpdateRotBootloaderDetails { expected_stage0_version: ArtifactVersion("0.0.1"), expected_stage0_next_version: NoValidVersion })
* only placed 0/2 desired nexus zones
* zone updates waiting on pending MGS updates (RoT / SP / Host OS / etc.)
* waiting to update top-level nexus_generation: pending non-nexus zone updates



Expand Down Expand Up @@ -1988,14 +1999,16 @@ INFO skipping board for MGS-driven update, serial_number: serial0, part_number:
INFO skipping board for MGS-driven update, serial_number: serial1, part_number: model1
INFO skipping board for MGS-driven update, serial_number: serial2, part_number: model2
INFO ran out of boards for MGS-driven update
INFO some zones not yet up-to-date, sled_id: 98e6b7c2-2efa-41ca-b20a-0a4d61102fe6, zones_currently_updating: [ZoneCurrentlyUpdating { zone_id: 0c71b3b2-6ceb-4e8f-b020-b08675e83038 (service), zone_kind: Nexus, reason: ImageSourceMismatch { bp_image_source: Artifact { version: Available { version: ArtifactVersion("1.0.0") }, hash: ArtifactHash("0e32b4a3e5d3668bb1d6a16fb06b74dc60b973fa479dcee0aae3adbb52bf1388") }, inv_image_source: InstallDataset } }, ZoneCurrentlyUpdating { zone_id: 427ec88f-f467-42fa-9bbb-66a91a36103c (service), zone_kind: InternalDns, reason: ImageSourceMismatch { bp_image_source: Artifact { version: Available { version: ArtifactVersion("1.0.0") }, hash: ArtifactHash("ffbf1373f7ee08dddd74c53ed2a94e7c4c572a982d3a9bc94000c6956b700c6a") }, inv_image_source: InstallDataset } }, ZoneCurrentlyUpdating { zone_id: 5199c033-4cf9-4ab6-8ae7-566bd7606363 (service), zone_kind: Crucible, reason: ImageSourceMismatch { bp_image_source: Artifact { version: Available { version: ArtifactVersion("1.0.0") }, hash: ArtifactHash("6f17cf65fb5a5bec5542dd07c03cd0acc01e59130f02c532c8d848ecae810047") }, inv_image_source: InstallDataset } }, ZoneCurrentlyUpdating { zone_id: 6444f8a5-6465-4f0b-a549-1993c113569c (service), zone_kind: InternalNtp, reason: ImageSourceMismatch { bp_image_source: Artifact { version: Available { version: ArtifactVersion("1.0.0") }, hash: ArtifactHash("67593d686ed04a1709f93972b71f4ebc148a9362120f65d239943e814a9a7439") }, inv_image_source: InstallDataset } }, ZoneCurrentlyUpdating { zone_id: 803bfb63-c246-41db-b0da-d3b87ddfc63d (service), zone_kind: ExternalDns, reason: ImageSourceMismatch { bp_image_source: Artifact { version: Available { version: ArtifactVersion("1.0.0") }, hash: ArtifactHash("ccca13ed19b8731f9adaf0d6203b02ea3b9ede4fa426b9fac0a07ce95440046d") }, inv_image_source: InstallDataset } }, ZoneCurrentlyUpdating { zone_id: ba4994a8-23f9-4b1a-a84f-a08d74591389 (service), zone_kind: CruciblePantry, reason: ImageSourceMismatch { bp_image_source: Artifact { version: Available { version: ArtifactVersion("1.0.0") }, hash: ArtifactHash("21f0ada306859c23917361f2e0b9235806c32607ec689c7e8cf16bb898bc5a02") }, inv_image_source: InstallDataset } }]
INFO some zones not yet up-to-date, zones_currently_updating: [ZonePropagationIncomplete { zone_id: 0c71b3b2-6ceb-4e8f-b020-b08675e83038 (service), zone_kind: Nexus, reason: ImageSourceMismatch { bp_image_source: Artifact { version: Available { version: ArtifactVersion("1.0.0") }, hash: ArtifactHash("0e32b4a3e5d3668bb1d6a16fb06b74dc60b973fa479dcee0aae3adbb52bf1388") }, inv_image_source: InstallDataset } }, ZonePropagationIncomplete { zone_id: 427ec88f-f467-42fa-9bbb-66a91a36103c (service), zone_kind: InternalDns, reason: ImageSourceMismatch { bp_image_source: Artifact { version: Available { version: ArtifactVersion("1.0.0") }, hash: ArtifactHash("ffbf1373f7ee08dddd74c53ed2a94e7c4c572a982d3a9bc94000c6956b700c6a") }, inv_image_source: InstallDataset } }, ZonePropagationIncomplete { zone_id: 5199c033-4cf9-4ab6-8ae7-566bd7606363 (service), zone_kind: Crucible, reason: ImageSourceMismatch { bp_image_source: Artifact { version: Available { version: ArtifactVersion("1.0.0") }, hash: ArtifactHash("6f17cf65fb5a5bec5542dd07c03cd0acc01e59130f02c532c8d848ecae810047") }, inv_image_source: InstallDataset } }, ZonePropagationIncomplete { zone_id: 6444f8a5-6465-4f0b-a549-1993c113569c (service), zone_kind: InternalNtp, reason: ImageSourceMismatch { bp_image_source: Artifact { version: Available { version: ArtifactVersion("1.0.0") }, hash: ArtifactHash("67593d686ed04a1709f93972b71f4ebc148a9362120f65d239943e814a9a7439") }, inv_image_source: InstallDataset } }, ZonePropagationIncomplete { zone_id: 803bfb63-c246-41db-b0da-d3b87ddfc63d (service), zone_kind: ExternalDns, reason: ImageSourceMismatch { bp_image_source: Artifact { version: Available { version: ArtifactVersion("1.0.0") }, hash: ArtifactHash("ccca13ed19b8731f9adaf0d6203b02ea3b9ede4fa426b9fac0a07ce95440046d") }, inv_image_source: InstallDataset } }, ZonePropagationIncomplete { zone_id: ba4994a8-23f9-4b1a-a84f-a08d74591389 (service), zone_kind: CruciblePantry, reason: ImageSourceMismatch { bp_image_source: Artifact { version: Available { version: ArtifactVersion("1.0.0") }, hash: ArtifactHash("21f0ada306859c23917361f2e0b9235806c32607ec689c7e8cf16bb898bc5a02") }, inv_image_source: InstallDataset } }, ZonePropagationIncomplete { zone_id: 3eeb8d49-eb1a-43f8-bb64-c2338421c2c6 (service), zone_kind: Nexus, reason: ImageSourceMismatch { bp_image_source: Artifact { version: Available { version: ArtifactVersion("2.0.0") }, hash: ArtifactHash("e9b7035f41848a987a798c15ac424cc91dd662b1af0920d58d8aa1ebad7467b6") }, inv_image_source: InstallDataset } }, ZonePropagationIncomplete { zone_id: 75b220ba-a0f4-4872-8202-dc7c87f062d0 (service), zone_kind: CruciblePantry, reason: ImageSourceMismatch { bp_image_source: Artifact { version: Available { version: ArtifactVersion("2.0.0") }, hash: ArtifactHash("3ff26dad96faa8f67251f5de40458b4f809d536bfe8572134da0e42c2fa12674") }, inv_image_source: InstallDataset } }, ZonePropagationIncomplete { zone_id: ea5b4030-b52f-44b2-8d70-45f15f987d01 (service), zone_kind: InternalDns, reason: ImageSourceMismatch { bp_image_source: Artifact { version: Available { version: ArtifactVersion("2.0.0") }, hash: ArtifactHash("de30657a72b066b8ef1f56351a0a5d4d7000da0a62c4be9b2e949a107ca8a389") }, inv_image_source: InstallDataset } }, ZonePropagationIncomplete { zone_id: f10a4fb9-759f-4a65-b25e-5794ad2d07d8 (service), zone_kind: InternalNtp, reason: ImageSourceMismatch { bp_image_source: Artifact { version: Available { version: ArtifactVersion("2.0.0") }, hash: ArtifactHash("d76e26198daed69cdae04490d7477f8c842e0dbe37d463eac0d0a8d3fb803095") }, inv_image_source: InstallDataset } }, ZonePropagationIncomplete { zone_id: f55647d4-5500-4ad3-893a-df45bd50d622 (service), zone_kind: Crucible, reason: ImageSourceMismatch { bp_image_source: Artifact { version: Available { version: ArtifactVersion("2.0.0") }, hash: ArtifactHash("866f6a7c2e51c056fb722b5113e80181cc9cd8b712a0d3dbf1edc4ce29e5229e") }, inv_image_source: InstallDataset } }, ZonePropagationIncomplete { zone_id: f6ec9c67-946a-4da3-98d5-581f72ce8bf0 (service), zone_kind: ExternalDns, reason: ImageSourceMismatch { bp_image_source: Artifact { version: Available { version: ArtifactVersion("2.0.0") }, hash: ArtifactHash("f282c45771429f7bebf71f0cc668521066db57c6bb07fcfccdfb44825d3d930f") }, inv_image_source: InstallDataset } }]
generated blueprint 12d602a6-5ab4-487a-b94e-eb30cdf30300 based on parent blueprint 8f2d1f39-7c88-4701-aa43-56bf281b28c1
planning report for blueprint 12d602a6-5ab4-487a-b94e-eb30cdf30300:
* skipping noop zone image source check on sled 98e6b7c2-2efa-41ca-b20a-0a4d61102fe6: all 6 zones are already from artifacts
* skipping noop zone image source check on sled d81c6a84-79b8-4958-ae41-ea46c9b19763: all 6 zones are already from artifacts
* noop converting host phase 2 slot B to Artifact on sled 2b8f0cb3-0295-4b3c-bc58-4fe88b57112c
* noop converting host phase 2 slot B to Artifact on sled 98e6b7c2-2efa-41ca-b20a-0a4d61102fe6
* noop converting host phase 2 slot B to Artifact on sled d81c6a84-79b8-4958-ae41-ea46c9b19763
* only placed 0/2 desired nexus zones
* waiting to update top-level nexus_generation: pending non-nexus zone updates


> blueprint-diff latest
Expand Down Expand Up @@ -2233,6 +2246,7 @@ planning report for blueprint 61a93ea3-c872-48e0-aace-e86b0c52b839:
- current target release generation (4) is lower than minimum required by blueprint (5)
- sleds have remove mupdate override set in blueprint: 98e6b7c2-2efa-41ca-b20a-0a4d61102fe6
* zone updates waiting on zone add blockers
* waiting to update top-level nexus_generation: pending non-nexus zone updates


> blueprint-diff latest
Expand Down Expand Up @@ -2362,7 +2376,9 @@ planner config:
* adding zones despite being blocked, as specified by the `add_zones_with_mupdate_override` planner config option
* discretionary zone placement waiting for NTP zones on sleds: c3bc4c6d-fdde-4fc4-8493-89d2a1e5ee6b
* missing NTP zone on sled c3bc4c6d-fdde-4fc4-8493-89d2a1e5ee6b
* only placed 0/2 desired nexus zones
* zone updates waiting on zone add blockers
* waiting to update top-level nexus_generation: pending non-nexus zone updates


> blueprint-diff latest
Expand Down
2 changes: 2 additions & 0 deletions dev-tools/reconfigurator-cli/tests/output/cmds-noop-image-source-stdout
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ planning report for blueprint 58d5e830-0884-47d8-a7cd-b2b3751adeb4:
* zone adds and updates are blocked:
- sleds have remove mupdate override set in blueprint: d81c6a84-79b8-4958-ae41-ea46c9b19763
* zone updates waiting on zone add blockers
* waiting to update top-level nexus_generation: pending non-nexus zone updates



Expand Down Expand Up @@ -422,6 +423,7 @@ planning report for blueprint af934083-59b5-4bf6-8966-6fb5292c29e1:
* zone adds and updates are blocked:
- sleds have remove mupdate override set in blueprint: d81c6a84-79b8-4958-ae41-ea46c9b19763
* zone updates waiting on zone add blockers
* waiting to update top-level nexus_generation: pending non-nexus zone updates



Expand Down
Loading