Skip to content

Add nexus_generation to blueprint #8863

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 7 commits into
base: main
Choose a base branch
from
Open

Add nexus_generation to blueprint #8863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ecd6a00
Add `nexus_generation` to blueprint
smklein Aug 18, 2025
3ce28b3
fix openapi-manager
smklein Aug 21, 2025
5ce4870
Remove sled_add_zone_nexus_internal, use config-based version
smklein Aug 25, 2025
3be10b8
Update comment about image sources
smklein Aug 25, 2025
55ebd1c
update names, comments, for zone propagation
smklein Aug 25, 2025
d5a6141
Merge with main
smklein Aug 26, 2025
4d7235b
Finish merging (adding nexus_generation to structs)
smklein Aug 26, 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
2 changes: 1 addition & 1 deletion dev-tools/omdb/src/bin/omdb/reconfigurator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ async fn cmd_reconfigurator_export(
// See Nexus::blueprint_planning_context().
eprint!("assembling reconfigurator state ... ");
let state = nexus_reconfigurator_preparation::reconfigurator_state_load(
opctx, datastore,
opctx, datastore, None,
)
.await?;
eprintln!("done");
Expand Down
3 changes: 3 additions & 0 deletions dev-tools/omdb/tests/successes.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1569,6 +1569,7 @@ parent: <none>
internal DNS version::: 1
external DNS version::: 2
target release min gen: 1
nexus gen:::::::::::::: 1

PENDING MGS-MANAGED UPDATES: 0

Expand Down Expand Up @@ -1692,6 +1693,7 @@ parent: <none>
internal DNS version::: 1
external DNS version::: 2
target release min gen: 1
nexus gen:::::::::::::: 1

PENDING MGS-MANAGED UPDATES: 0

Expand All @@ -1717,6 +1719,7 @@ to: blueprint ......<REDACTED_BLUEPRINT_ID>.......
internal DNS version::: 1 (unchanged)
external DNS version::: 2 (unchanged)
target release min gen: 1 (unchanged)
nexus gen:::::::::::::: 1 (unchanged)

OXIMETER SETTINGS:
generation: 1 (unchanged)
Expand Down
1 change: 1 addition & 0 deletions dev-tools/reconfigurator-cli/tests/output/cmds-add-sled-no-disks-stdout
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,7 @@ parent: dbcbd3d6-41ff-48ae-ac0b-1becc9b2fd21
internal DNS version::: 1
external DNS version::: 1
target release min gen: 1
nexus gen:::::::::::::: 1

PENDING MGS-MANAGED UPDATES: 0

Expand Down
9 changes: 8 additions & 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 @@ -399,6 +399,7 @@ parent: 02697f74-b14a-4418-90f0-c28b2a3a6aa9
internal DNS version::: 1
external DNS version::: 1
target release min gen: 1
nexus gen:::::::::::::: 1

PENDING MGS-MANAGED UPDATES: 0

Expand Down Expand Up @@ -518,6 +519,7 @@ parent: 02697f74-b14a-4418-90f0-c28b2a3a6aa9
internal DNS version::: 1
external DNS version::: 1
target release min gen: 1
nexus gen:::::::::::::: 1

PENDING MGS-MANAGED UPDATES: 0

Expand Down Expand Up @@ -551,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:
chicken switches:
Expand Down Expand Up @@ -633,6 +635,7 @@ to: blueprint 86db3308-f817-4626-8838-4085949a6a41
internal DNS version::: 1 (unchanged)
external DNS version::: 1 (unchanged)
target release min gen: 1 (unchanged)
nexus gen:::::::::::::: 1 (unchanged)

OXIMETER SETTINGS:
generation: 1 (unchanged)
Expand Down Expand Up @@ -713,6 +716,7 @@ to: blueprint 86db3308-f817-4626-8838-4085949a6a41
internal DNS version::: 1 (unchanged)
external DNS version::: 1 (unchanged)
target release min gen: 1 (unchanged)
nexus gen:::::::::::::: 1 (unchanged)

OXIMETER SETTINGS:
generation: 1 (unchanged)
Expand Down Expand Up @@ -793,6 +797,7 @@ to: blueprint 02697f74-b14a-4418-90f0-c28b2a3a6aa9
internal DNS version::: 1 (unchanged)
external DNS version::: 1 (unchanged)
target release min gen: 1 (unchanged)
nexus gen:::::::::::::: 1 (unchanged)

OXIMETER SETTINGS:
generation: 1 (unchanged)
Expand Down Expand Up @@ -1032,6 +1037,7 @@ parent: 02697f74-b14a-4418-90f0-c28b2a3a6aa9
internal DNS version::: 1
external DNS version::: 1
target release min gen: 1
nexus gen:::::::::::::: 1

PENDING MGS-MANAGED UPDATES: 0

Expand Down Expand Up @@ -1670,6 +1676,7 @@ to: blueprint 86db3308-f817-4626-8838-4085949a6a41
internal DNS version::: 1 (unchanged)
external DNS version::: 1 (unchanged)
target release min gen: 1 (unchanged)
nexus gen:::::::::::::: 1 (unchanged)

OXIMETER SETTINGS:
generation: 1 (unchanged)
Expand Down
10 changes: 8 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 @@ -331,6 +331,7 @@ parent: 06c88262-f435-410e-ba98-101bed41ec27
internal DNS version::: 1
external DNS version::: 1
target release min gen: 1
nexus gen:::::::::::::: 1

PENDING MGS-MANAGED UPDATES: 0

Expand Down Expand Up @@ -463,6 +464,7 @@ to: blueprint 366b0b68-d80e-4bc1-abd3-dc69837847e0
internal DNS version::: 1 (unchanged)
external DNS version::: 1 (unchanged)
target release min gen: 1 (unchanged)
nexus gen:::::::::::::: 1 (unchanged)

OXIMETER SETTINGS:
generation: 1 (unchanged)
Expand Down Expand Up @@ -1022,6 +1024,7 @@ parent: 3f00b694-1b16-4aaa-8f78-e6b3a527b434
internal DNS version::: 1
external DNS version::: 1
target release min gen: 1
nexus gen:::::::::::::: 1

PENDING MGS-MANAGED UPDATES: 0

Expand All @@ -1039,7 +1042,7 @@ chicken switches:
add zones with mupdate override: false

* 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 @@ -1163,6 +1166,7 @@ to: blueprint 9c998c1d-1a7b-440a-ae0c-40f781dea6e2
internal DNS version::: 1 (unchanged)
external DNS version::: 1 (unchanged)
target release min gen: 1 (unchanged)
nexus gen:::::::::::::: 1 (unchanged)

OXIMETER SETTINGS:
generation: 1 (unchanged)
Expand Down Expand Up @@ -1725,6 +1729,7 @@ parent: 366b0b68-d80e-4bc1-abd3-dc69837847e0
internal DNS version::: 1
external DNS version::: 1
target release min gen: 1
nexus gen:::::::::::::: 1

PENDING MGS-MANAGED UPDATES: 0

Expand All @@ -1733,7 +1738,7 @@ chicken switches:
add zones with mupdate override: false

* 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 @@ -1859,6 +1864,7 @@ to: blueprint 2ac8c740-444d-42ff-8d66-9812a7e51288
internal DNS version::: 1 (unchanged)
external DNS version::: 1 (unchanged)
target release min gen: 1 (unchanged)
nexus gen:::::::::::::: 1 (unchanged)

OXIMETER SETTINGS:
generation: 1 (unchanged)
Expand Down
6 changes: 5 additions & 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 @@ -329,6 +329,7 @@ parent: 184f10b3-61cb-41ef-9b93-3489b2bac559
internal DNS version::: 1
external DNS version::: 1
target release min gen: 1
nexus gen:::::::::::::: 1

PENDING MGS-MANAGED UPDATES: 0

Expand Down Expand Up @@ -461,6 +462,7 @@ to: blueprint 8da82a8e-bf97-4fbd-8ddd-9f6462732cf1
internal DNS version::: 1 (unchanged)
external DNS version::: 1 (unchanged)
target release min gen: 1 (unchanged)
nexus gen:::::::::::::: 1 (unchanged)

OXIMETER SETTINGS:
generation: 1 (unchanged)
Expand Down Expand Up @@ -820,6 +822,7 @@ to: blueprint 58d5e830-0884-47d8-a7cd-b2b3751adeb4
internal DNS version::: 1 (unchanged)
external DNS version::: 1 (unchanged)
target release min gen: 1 (unchanged)
nexus gen:::::::::::::: 1 (unchanged)

OXIMETER SETTINGS:
generation: 1 (unchanged)
Expand Down Expand Up @@ -1053,7 +1056,7 @@ chicken switches:
add zones with mupdate override: false

* 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 Expand Up @@ -1177,6 +1180,7 @@ to: blueprint af934083-59b5-4bf6-8966-6fb5292c29e1
internal DNS version::: 1 (unchanged)
external DNS version::: 1 (unchanged)
target release min gen: 1 (unchanged)
nexus gen:::::::::::::: 1 (unchanged)

OXIMETER SETTINGS:
generation: 1 (unchanged)
Expand Down
6 changes: 6 additions & 0 deletions dev-tools/reconfigurator-cli/tests/output/cmds-host-phase-2-source-stdout
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ to: blueprint 8da82a8e-bf97-4fbd-8ddd-9f6462732cf1
internal DNS version::: 1 (unchanged)
external DNS version::: 1 (unchanged)
target release min gen: 1 (unchanged)
nexus gen:::::::::::::: 1 (unchanged)

OXIMETER SETTINGS:
generation: 1 (unchanged)
Expand Down Expand Up @@ -430,6 +431,7 @@ to: blueprint 58d5e830-0884-47d8-a7cd-b2b3751adeb4
internal DNS version::: 1 (unchanged)
external DNS version::: 1 (unchanged)
target release min gen: 1 (unchanged)
nexus gen:::::::::::::: 1 (unchanged)

OXIMETER SETTINGS:
generation: 1 (unchanged)
Expand Down Expand Up @@ -709,6 +711,7 @@ parent: 8da82a8e-bf97-4fbd-8ddd-9f6462732cf1
internal DNS version::: 1
external DNS version::: 1
target release min gen: 1
nexus gen:::::::::::::: 1

PENDING MGS-MANAGED UPDATES: 0

Expand Down Expand Up @@ -860,6 +863,7 @@ to: blueprint af934083-59b5-4bf6-8966-6fb5292c29e1
internal DNS version::: 1 (unchanged)
external DNS version::: 1 (unchanged)
target release min gen: 1 (unchanged)
nexus gen:::::::::::::: 1 (unchanged)

OXIMETER SETTINGS:
generation: 1 (unchanged)
Expand Down Expand Up @@ -1140,6 +1144,7 @@ to: blueprint df06bb57-ad42-4431-9206-abff322896c7
internal DNS version::: 1 (unchanged)
external DNS version::: 1 (unchanged)
target release min gen: 1 (unchanged)
nexus gen:::::::::::::: 1 (unchanged)

OXIMETER SETTINGS:
generation: 1 (unchanged)
Expand Down Expand Up @@ -1419,6 +1424,7 @@ parent: af934083-59b5-4bf6-8966-6fb5292c29e1
internal DNS version::: 1
external DNS version::: 1
target release min gen: 1
nexus gen:::::::::::::: 1

PENDING MGS-MANAGED UPDATES: 0

Expand Down
Loading
Loading