Skip to content
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

[reconfigurator] BlueprintBuilder cleanup 4/5 - when choosing a zpool, it must be from a disk present in the blueprint #7106

Merged
merged 12 commits into from
Nov 22, 2024
Merged

[reconfigurator] BlueprintBuilder cleanup 4/5 - when choosing a zpool, it must be from a disk present in the blueprint #7106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
235a74f
[reconfigurator] sled_select_zpool: Require chosen zpool to be on a d…
jgallagher Nov 11, 2024
bcf78ad
fix reconfigurator-cli integration test
jgallagher Nov 18, 2024
48028fa
fix sim sled-agent gen check and executor tests
jgallagher Nov 18, 2024
b8a7670
remove unused imports
jgallagher Nov 18, 2024
2905b18
expectorate
jgallagher Nov 18, 2024
11c05fd
attempt to stabilize dataset row ordering in blueprint diffs after UU…
jgallagher Nov 19, 2024
0498183
fix vpc test (no disks on sleds)
jgallagher Nov 19, 2024
fdfe91f
continue stabilizing dataset output in diffs
jgallagher Nov 19, 2024
fee229a
fixups from main
jgallagher Nov 19, 2024
2371e04
expectorate
jgallagher Nov 19, 2024
630ea16
better method name
jgallagher Nov 21, 2024
f3652cc
fix sim sled-agent generation check
jgallagher Nov 21, 2024
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
136 changes: 130 additions & 6 deletions dev-tools/omdb/tests/successes.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1220,8 +1220,49 @@ stdout:
blueprint ......<REDACTED_BLUEPRINT_ID>.......
parent: <none>

!..........<REDACTED_UUID>...........
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wow, it is nice to get rid of this!

WARNING: Zones exist without physical disks!
sled: ..........<REDACTED_UUID>........... (active)

physical disks at generation 2:
---------------------------------------------------
vendor model serial
---------------------------------------------------
nexus-tests nexus-test-model nexus-test-disk-10
nexus-tests nexus-test-model nexus-test-disk-11
nexus-tests nexus-test-model nexus-test-disk-12
nexus-tests nexus-test-model nexus-test-disk-13
nexus-tests nexus-test-model nexus-test-disk-14
nexus-tests nexus-test-model nexus-test-disk-15
nexus-tests nexus-test-model nexus-test-disk-16
nexus-tests nexus-test-model nexus-test-disk-17
nexus-tests nexus-test-model nexus-test-disk-18
nexus-tests nexus-test-model nexus-test-disk-19


omicron zones at generation 2:
-----------------------------------------------
zone type zone id disposition underlay IP
-----------------------------------------------



sled: ..........<REDACTED_UUID>........... (active)

physical disks at generation 2:
--------------------------------------------------
vendor model serial
--------------------------------------------------
nexus-tests nexus-test-model nexus-test-disk-0
nexus-tests nexus-test-model nexus-test-disk-1
nexus-tests nexus-test-model nexus-test-disk-2
nexus-tests nexus-test-model nexus-test-disk-3
nexus-tests nexus-test-model nexus-test-disk-4
nexus-tests nexus-test-model nexus-test-disk-5
nexus-tests nexus-test-model nexus-test-disk-6
nexus-tests nexus-test-model nexus-test-disk-7
nexus-tests nexus-test-model nexus-test-disk-8
nexus-tests nexus-test-model nexus-test-disk-9


omicron zones at generation 2:
---------------------------------------------------------------------------------------
zone type zone id disposition underlay IP
Expand All @@ -1234,7 +1275,6 @@ WARNING: Zones exist without physical disks!
nexus ..........<REDACTED_UUID>........... in service ::ffff:127.0.0.1



COCKROACHDB SETTINGS:
state fingerprint::::::::::::::::: <COCKROACHDB_FINGERPRINT_REDACTED>
cluster.preserve_downgrade_option: <COCKROACHDB_VERSION_REDACTED>
Expand All @@ -1258,8 +1298,49 @@ stdout:
blueprint ......<REDACTED_BLUEPRINT_ID>.......
parent: <none>

!..........<REDACTED_UUID>...........
WARNING: Zones exist without physical disks!
sled: ..........<REDACTED_UUID>........... (active)

physical disks at generation 2:
---------------------------------------------------
vendor model serial
---------------------------------------------------
nexus-tests nexus-test-model nexus-test-disk-10
nexus-tests nexus-test-model nexus-test-disk-11
nexus-tests nexus-test-model nexus-test-disk-12
nexus-tests nexus-test-model nexus-test-disk-13
nexus-tests nexus-test-model nexus-test-disk-14
nexus-tests nexus-test-model nexus-test-disk-15
nexus-tests nexus-test-model nexus-test-disk-16
nexus-tests nexus-test-model nexus-test-disk-17
nexus-tests nexus-test-model nexus-test-disk-18
nexus-tests nexus-test-model nexus-test-disk-19


omicron zones at generation 2:
-----------------------------------------------
zone type zone id disposition underlay IP
-----------------------------------------------



sled: ..........<REDACTED_UUID>........... (active)

physical disks at generation 2:
--------------------------------------------------
vendor model serial
--------------------------------------------------
nexus-tests nexus-test-model nexus-test-disk-0
nexus-tests nexus-test-model nexus-test-disk-1
nexus-tests nexus-test-model nexus-test-disk-2
nexus-tests nexus-test-model nexus-test-disk-3
nexus-tests nexus-test-model nexus-test-disk-4
nexus-tests nexus-test-model nexus-test-disk-5
nexus-tests nexus-test-model nexus-test-disk-6
nexus-tests nexus-test-model nexus-test-disk-7
nexus-tests nexus-test-model nexus-test-disk-8
nexus-tests nexus-test-model nexus-test-disk-9


omicron zones at generation 2:
---------------------------------------------------------------------------------------
zone type zone id disposition underlay IP
Expand All @@ -1272,7 +1353,6 @@ WARNING: Zones exist without physical disks!
nexus ..........<REDACTED_UUID>........... in service ::ffff:127.0.0.1



COCKROACHDB SETTINGS:
state fingerprint::::::::::::::::: <COCKROACHDB_FINGERPRINT_REDACTED>
cluster.preserve_downgrade_option: <COCKROACHDB_VERSION_REDACTED>
Expand Down Expand Up @@ -1300,8 +1380,52 @@ to: blueprint ......<REDACTED_BLUEPRINT_ID>.......

sled ..........<REDACTED_UUID>........... (active):

physical disks at generation 2:
---------------------------------------------------
vendor model serial
---------------------------------------------------
nexus-tests nexus-test-model nexus-test-disk-10
nexus-tests nexus-test-model nexus-test-disk-11
nexus-tests nexus-test-model nexus-test-disk-12
nexus-tests nexus-test-model nexus-test-disk-13
nexus-tests nexus-test-model nexus-test-disk-14
nexus-tests nexus-test-model nexus-test-disk-15
nexus-tests nexus-test-model nexus-test-disk-16
nexus-tests nexus-test-model nexus-test-disk-17
nexus-tests nexus-test-model nexus-test-disk-18
nexus-tests nexus-test-model nexus-test-disk-19


sled ..........<REDACTED_UUID>........... (active):

physical disks at generation 2:
--------------------------------------------------
vendor model serial
--------------------------------------------------
nexus-tests nexus-test-model nexus-test-disk-0
nexus-tests nexus-test-model nexus-test-disk-1
nexus-tests nexus-test-model nexus-test-disk-2
nexus-tests nexus-test-model nexus-test-disk-3
nexus-tests nexus-test-model nexus-test-disk-4
nexus-tests nexus-test-model nexus-test-disk-5
nexus-tests nexus-test-model nexus-test-disk-6
nexus-tests nexus-test-model nexus-test-disk-7
nexus-tests nexus-test-model nexus-test-disk-8
nexus-tests nexus-test-model nexus-test-disk-9


datasets at generation 2:
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
dataset name dataset uuid quota reservation compression
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
oxp_..........<REDACTED_UUID>.........../crypt/zone/oxz_clickhouse_..........<REDACTED_UUID>........... ..........<REDACTED_UUID>........... none none off
oxp_..........<REDACTED_UUID>.........../crypt/zone/oxz_cockroachdb_..........<REDACTED_UUID>........... ..........<REDACTED_UUID>........... none none off
oxp_..........<REDACTED_UUID>.........../crypt/zone/oxz_crucible_pantry_..........<REDACTED_UUID>........... ..........<REDACTED_UUID>........... none none off
oxp_..........<REDACTED_UUID>.........../crypt/zone/oxz_external_dns_..........<REDACTED_UUID>........... ..........<REDACTED_UUID>........... none none off
oxp_..........<REDACTED_UUID>.........../crypt/zone/oxz_internal_dns_..........<REDACTED_UUID>........... ..........<REDACTED_UUID>........... none none off
oxp_..........<REDACTED_UUID>.........../crypt/zone/oxz_nexus_..........<REDACTED_UUID>........... ..........<REDACTED_UUID>........... none none off


omicron zones at generation 2:
---------------------------------------------------------------------------------------
zone type zone id disposition underlay IP
Expand Down
Loading
Loading