Skip to content

Local storage [1/4]: add local_storage dataset #9264

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

Merged
merged 5 commits into from
Nov 6, 2025
Merged

Local storage [1/4]: add local_storage dataset #9264

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bb96033
Local storage [1/4]: add local_storage dataset
jmpesp Sep 8, 2025
e8b0d00
remove XXX comment / question
jmpesp Oct 23, 2025
70ccf19
local storage datasets should be managed like debug datasets
jmpesp Oct 23, 2025
932b15d
Merge branch 'main' into local_storage_1_dataset
jmpesp Oct 23, 2025
b6bd044
Merge branch 'main' into local_storage_1_dataset
jmpesp Nov 6, 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
9 changes: 9 additions & 0 deletions common/src/api/internal/shared.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -943,6 +943,9 @@ pub enum DatasetKind {

// Other datasets
Debug,

/// Used for transient storage, contains volumes delegated to VMMs
LocalStorage,
}

impl Serialize for DatasetKind {
Expand Down Expand Up @@ -1003,7 +1006,10 @@ impl DatasetKind {
match self {
Cockroach | Crucible | Clickhouse | ClickhouseKeeper
| ClickhouseServer | ExternalDns | InternalDns => true,

TransientZoneRoot | TransientZone { .. } | Debug => false,

LocalStorage => true,
}
}

Expand Down Expand Up @@ -1041,6 +1047,7 @@ impl fmt::Display for DatasetKind {
return Ok(());
}
Debug => "debug",
LocalStorage => "local_storage",
};
write!(f, "{}", s)
}
Expand All @@ -1067,6 +1074,7 @@ impl FromStr for DatasetKind {
"internal_dns" => InternalDns,
"zone" => TransientZoneRoot,
"debug" => Debug,
"local_storage" => LocalStorage,
other => {
if let Some(name) = other.strip_prefix("zone/") {
TransientZone { name: name.to_string() }
Expand Down Expand Up @@ -1162,6 +1170,7 @@ mod tests {
DatasetKind::TransientZoneRoot,
DatasetKind::TransientZone { name: String::from("myzone") },
DatasetKind::Debug,
DatasetKind::LocalStorage,
];

assert_eq!(kinds.len(), DatasetKind::COUNT);
Expand Down
16 changes: 16 additions & 0 deletions dev-tools/omdb/src/bin/omdb/nexus.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1489,6 +1489,7 @@ fn print_task_blueprint_rendezvous(details: &serde_json::Value) {
" inventory collection: {}",
status.inventory_collection_id
);

println!(" debug_dataset rendezvous counts:");
println!(
" num_inserted: {}",
Expand All @@ -1510,6 +1511,7 @@ fn print_task_blueprint_rendezvous(details: &serde_json::Value) {
" num_already_tombstoned: {}",
status.stats.debug_dataset.num_already_tombstoned
);

println!(" crucible_dataset rendezvous counts:");
println!(
" num_inserted: {}",
Expand All @@ -1523,6 +1525,20 @@ fn print_task_blueprint_rendezvous(details: &serde_json::Value) {
" num_not_in_inventory: {}",
status.stats.crucible_dataset.num_not_in_inventory
);

println!(" local_storage_dataset rendezvous counts:");
println!(
" num_inserted: {}",
status.stats.local_storage_dataset.num_inserted
);
println!(
" num_already_exist: {}",
status.stats.local_storage_dataset.num_already_exist
);
println!(
" num_not_in_inventory: {}",
status.stats.local_storage_dataset.num_not_in_inventory
);
}
}
}
Expand Down
8 changes: 8 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 @@ -580,6 +580,10 @@ task: "blueprint_rendezvous"
num_inserted: 0
num_already_exist: 0
num_not_in_inventory: 0
local_storage_dataset rendezvous counts:
num_inserted: 0
num_already_exist: 0
num_not_in_inventory: 0

task: "crdb_node_id_collector"
configured period: every <REDACTED_DURATION>m
Expand Down Expand Up @@ -1115,6 +1119,10 @@ task: "blueprint_rendezvous"
num_inserted: 0
num_already_exist: 0
num_not_in_inventory: 0
local_storage_dataset rendezvous counts:
num_inserted: 0
num_already_exist: 0
num_not_in_inventory: 0

task: "crdb_node_id_collector"
configured period: every <REDACTED_DURATION>m
Expand Down
115 changes: 62 additions & 53 deletions dev-tools/reconfigurator-cli/tests/output/cmds-add-sled-no-disks-stdout
View file
Open in desktop

Large diffs are not rendered by default.

74 changes: 40 additions & 34 deletions dev-tools/reconfigurator-cli/tests/output/cmds-add-zones-with-mupdate-override-stdout
View file
Open in desktop

Large diffs are not rendered by default.

608 changes: 334 additions & 274 deletions dev-tools/reconfigurator-cli/tests/output/cmds-blueprint-history-stdout
View file
Open in desktop

Large diffs are not rendered by default.

933 changes: 513 additions & 420 deletions dev-tools/reconfigurator-cli/tests/output/cmds-example-stdout
View file
Open in desktop

Large diffs are not rendered by default.

1,220 changes: 670 additions & 550 deletions dev-tools/reconfigurator-cli/tests/output/cmds-expunge-newly-added-external-dns-stdout
View file
Open in desktop

Large diffs are not rendered by default.

616 changes: 338 additions & 278 deletions dev-tools/reconfigurator-cli/tests/output/cmds-expunge-newly-added-internal-dns-stdout
View file
Open in desktop

Large diffs are not rendered by default.

226 changes: 122 additions & 104 deletions dev-tools/reconfigurator-cli/tests/output/cmds-expunge-zones-stdout
View file
Open in desktop

Large diffs are not rendered by default.

768 changes: 414 additions & 354 deletions dev-tools/reconfigurator-cli/tests/output/cmds-host-phase-2-source-stdout
View file
Open in desktop

Large diffs are not rendered by default.

127 changes: 68 additions & 59 deletions dev-tools/reconfigurator-cli/tests/output/cmds-missing-sled-blocks-zone-updates-stdout
View file
Open in desktop

Large diffs are not rendered by default.

130 changes: 68 additions & 62 deletions ...tools/reconfigurator-cli/tests/output/cmds-mupdate-override-without-target-release-stdout
View file
Open in desktop

Large diffs are not rendered by default.

607 changes: 325 additions & 282 deletions dev-tools/reconfigurator-cli/tests/output/cmds-mupdate-update-flow-stdout
View file
Open in desktop

Large diffs are not rendered by default.

724 changes: 398 additions & 326 deletions dev-tools/reconfigurator-cli/tests/output/cmds-nexus-generation-autobump-stdout
View file
Open in desktop

Large diffs are not rendered by default.

37 changes: 20 additions & 17 deletions dev-tools/reconfigurator-cli/tests/output/cmds-nexus-generation-stdout
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,25 +67,28 @@ to: blueprint 8da82a8e-bf97-4fbd-8ddd-9f6462732cf1
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
dataset name dataset id disposition quota reservation compression
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
oxp_073979dd-3248-44a5-9fa1-cc72a140d682/crucible 7b4ce6bf-95bb-42fe-a4a0-dff31211ab88 in service none none off
oxp_c6d33b64-fb96-4129-bab1-7878a06a5f9b/crucible ea8a11bf-a884-4c4f-8df0-3ef9b7aacf43 in service none none off
oxp_e4d937e1-6ddc-4eca-bb08-c1f73791e608/crucible 50b029e3-96aa-41e5-bf39-023193a4355e in service none none off
oxp_073979dd-3248-44a5-9fa1-cc72a140d682/crypt/external_dns 4847a96e-a267-4ae7-aa3d-805c1e77f81e in service none none off
oxp_073979dd-3248-44a5-9fa1-cc72a140d682/crypt/internal_dns ad41be71-6c15-4428-b510-20ceacde4fa6 in service none none off
oxp_073979dd-3248-44a5-9fa1-cc72a140d682/crucible 02c56a30-7d97-406d-bd34-1eb437fd517d in service none none off
oxp_c6d33b64-fb96-4129-bab1-7878a06a5f9b/crucible 90b46084-4238-45ba-9e26-d3f2623e640e in service none none off
oxp_e4d937e1-6ddc-4eca-bb08-c1f73791e608/crucible bcdc7bf3-bbae-4e7f-81b2-4d94c8f752a4 in service none none off
oxp_073979dd-3248-44a5-9fa1-cc72a140d682/crypt/external_dns 7b4ce6bf-95bb-42fe-a4a0-dff31211ab88 in service none none off
oxp_073979dd-3248-44a5-9fa1-cc72a140d682/crypt/internal_dns 42430c80-7836-4191-a4f6-bcee749010fe in service none none off
oxp_073979dd-3248-44a5-9fa1-cc72a140d682/crypt/zone 4617d206-4330-4dfa-b9f3-f63a3db834f9 in service none none off
oxp_c6d33b64-fb96-4129-bab1-7878a06a5f9b/crypt/zone 793ac181-1b01-403c-850d-7f5c54bda6c9 in service none none off
oxp_e4d937e1-6ddc-4eca-bb08-c1f73791e608/crypt/zone 4f60b534-eaa3-40a1-b60f-bfdf147af478 in service none none off
oxp_e4d937e1-6ddc-4eca-bb08-c1f73791e608/crypt/zone/oxz_crucible_058fd5f9-60a8-4e11-9302-15172782e17d 02c56a30-7d97-406d-bd34-1eb437fd517d in service none none off
oxp_073979dd-3248-44a5-9fa1-cc72a140d682/crypt/zone/oxz_crucible_5199c033-4cf9-4ab6-8ae7-566bd7606363 832fd140-d467-4bad-b5e9-63171634087c in service none none off
oxp_c6d33b64-fb96-4129-bab1-7878a06a5f9b/crypt/zone/oxz_crucible_dfac80b4-a887-430a-ae87-a4e065dba787 4d7e3e8e-06bd-414c-a468-779e056a9b75 in service none none off
oxp_073979dd-3248-44a5-9fa1-cc72a140d682/crypt/zone/oxz_crucible_pantry_ba4994a8-23f9-4b1a-a84f-a08d74591389 42430c80-7836-4191-a4f6-bcee749010fe in service none none off
oxp_073979dd-3248-44a5-9fa1-cc72a140d682/crypt/zone/oxz_external_dns_803bfb63-c246-41db-b0da-d3b87ddfc63d 43931274-7fe8-4077-825d-dff2bc8efa58 in service none none off
oxp_073979dd-3248-44a5-9fa1-cc72a140d682/crypt/zone/oxz_internal_dns_427ec88f-f467-42fa-9bbb-66a91a36103c 1bca7f71-5e42-4749-91ec-fa40793a3a9a in service none none off
oxp_073979dd-3248-44a5-9fa1-cc72a140d682/crypt/zone/oxz_nexus_0c71b3b2-6ceb-4e8f-b020-b08675e83038 a4c3032e-21fa-4d4a-b040-a7e3c572cf3c in service none none off
oxp_073979dd-3248-44a5-9fa1-cc72a140d682/crypt/zone/oxz_ntp_6444f8a5-6465-4f0b-a549-1993c113569c 3ac089c9-9dec-465b-863a-188e80d71fb4 in service none none off
oxp_c6d33b64-fb96-4129-bab1-7878a06a5f9b/crypt/zone 686c19cf-a0d7-45f6-866f-c564612b2664 in service none none off
oxp_e4d937e1-6ddc-4eca-bb08-c1f73791e608/crypt/zone a4c3032e-21fa-4d4a-b040-a7e3c572cf3c in service none none off
oxp_e4d937e1-6ddc-4eca-bb08-c1f73791e608/crypt/zone/oxz_crucible_058fd5f9-60a8-4e11-9302-15172782e17d 335e1dc3-b610-48dd-90bb-9ca5cce1a6d0 in service none none off
oxp_073979dd-3248-44a5-9fa1-cc72a140d682/crypt/zone/oxz_crucible_5199c033-4cf9-4ab6-8ae7-566bd7606363 ea8a11bf-a884-4c4f-8df0-3ef9b7aacf43 in service none none off
oxp_c6d33b64-fb96-4129-bab1-7878a06a5f9b/crypt/zone/oxz_crucible_dfac80b4-a887-430a-ae87-a4e065dba787 50b029e3-96aa-41e5-bf39-023193a4355e in service none none off
oxp_073979dd-3248-44a5-9fa1-cc72a140d682/crypt/zone/oxz_crucible_pantry_ba4994a8-23f9-4b1a-a84f-a08d74591389 4d7e3e8e-06bd-414c-a468-779e056a9b75 in service none none off
oxp_073979dd-3248-44a5-9fa1-cc72a140d682/crypt/zone/oxz_external_dns_803bfb63-c246-41db-b0da-d3b87ddfc63d 832fd140-d467-4bad-b5e9-63171634087c in service none none off
oxp_073979dd-3248-44a5-9fa1-cc72a140d682/crypt/zone/oxz_internal_dns_427ec88f-f467-42fa-9bbb-66a91a36103c 4847a96e-a267-4ae7-aa3d-805c1e77f81e in service none none off
oxp_073979dd-3248-44a5-9fa1-cc72a140d682/crypt/zone/oxz_nexus_0c71b3b2-6ceb-4e8f-b020-b08675e83038 43931274-7fe8-4077-825d-dff2bc8efa58 in service none none off
oxp_073979dd-3248-44a5-9fa1-cc72a140d682/crypt/zone/oxz_ntp_6444f8a5-6465-4f0b-a549-1993c113569c ad41be71-6c15-4428-b510-20ceacde4fa6 in service none none off
oxp_073979dd-3248-44a5-9fa1-cc72a140d682/crypt/debug 248c6c10-1ac6-45de-bb55-ede36ca56bbd in service 100 GiB none gzip-9
oxp_c6d33b64-fb96-4129-bab1-7878a06a5f9b/crypt/debug cdf3684f-a6cf-4449-b9ec-e696b2c663e2 in service 100 GiB none gzip-9
oxp_e4d937e1-6ddc-4eca-bb08-c1f73791e608/crypt/debug 686c19cf-a0d7-45f6-866f-c564612b2664 in service 100 GiB none gzip-9
oxp_c6d33b64-fb96-4129-bab1-7878a06a5f9b/crypt/debug 793ac181-1b01-403c-850d-7f5c54bda6c9 in service 100 GiB none gzip-9
oxp_e4d937e1-6ddc-4eca-bb08-c1f73791e608/crypt/debug 3ac089c9-9dec-465b-863a-188e80d71fb4 in service 100 GiB none gzip-9
oxp_073979dd-3248-44a5-9fa1-cc72a140d682/crypt/local_storage cdf3684f-a6cf-4449-b9ec-e696b2c663e2 in service none none off
oxp_c6d33b64-fb96-4129-bab1-7878a06a5f9b/crypt/local_storage 4f60b534-eaa3-40a1-b60f-bfdf147af478 in service none none off
oxp_e4d937e1-6ddc-4eca-bb08-c1f73791e608/crypt/local_storage 1bca7f71-5e42-4749-91ec-fa40793a3a9a in service none none off
+ oxp_c6d33b64-fb96-4129-bab1-7878a06a5f9b/crypt/zone/oxz_nexus_16a766ee-9400-4e67-9363-883670371a1b 5205257b-48e5-4fb8-827a-9a7b29f43dbe in service none none off


Expand Down
Loading
Loading