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.

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

[sled agent] Create and use self-assembling zones for storage zones #1902

Merged
merged 35 commits into from
Apr 21, 2023
Merged
Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
29bbfc2
[package] Destroy datasets as a part of uninstallation
smklein Oct 30, 2022
ef533ae
[sled agent] Add SMF profile builder
smklein Oct 31, 2022
9bae2a9
crdb uses a method script
smklein Oct 31, 2022
2bf35ca
CRDB is booting the 'new' way
smklein Nov 1, 2022
774b86e
Self-assembling clickhouse
smklein Nov 1, 2022
eaea77b
self-assembling crucible
smklein Nov 1, 2022
8d30fc9
formatting
smklein Nov 1, 2022
afb19c5
Merge branch 'main' into uninstall-zfs
smklein Nov 1, 2022
626fdad
Fix typo
smklein Nov 1, 2022
8940321
Merge branch 'uninstall-zfs' into self-assembling-zones
smklein Nov 1, 2022
0274225
Merge branch 'main' into self-assembling-zones
smklein Nov 1, 2022
75a1e8c
Merge branch 'main' into self-assembling-zones
smklein Nov 2, 2022
e6f016c
Merge branch 'main' into self-assembling-zones
smklein Nov 10, 2022
792d312
Merge branch 'main' into self-assembling-zones
smklein Nov 14, 2022
7d1a2a5
Merge branch 'main' into self-assembling-zones
smklein Mar 7, 2023
a679a4b
fix mismerge
smklein Mar 7, 2023
7948af7
Merge branch 'main' into self-assembling-zones
smklein Apr 19, 2023
58f77f6
lock
smklein Apr 19, 2023
fedd4c0
Updates for CruciblePantry
smklein Apr 19, 2023
a10617d
Bump revs for crucibles
smklein Apr 20, 2023
c3c4f52
Remove single_instance
smklein Apr 20, 2023
d80b632
convert to oxide/service name where possible
smklein Apr 20, 2023
3d22b05
review feedback
smklein Apr 20, 2023
b5a9ec9
More method script cleanup
smklein Apr 20, 2023
a62d759
Rename to ServiceInstanceBuilder
smklein Apr 20, 2023
efc139b
Split instance from service
smklein Apr 20, 2023
f1ddb57
package manifest
smklein Apr 20, 2023
8b6648b
fmt
smklein Apr 20, 2023
89377fc
Let me see the propolis log
smklein Apr 20, 2023
23977fd
Merge branch 'main' into self-assembling-zones
smklein Apr 20, 2023
26bcf31
Update manifest
smklein Apr 20, 2023
bbff097
Start CRDB in background so the start task transitions it to 'online'
smklein Apr 20, 2023
dca16bc
Merge branch 'main' into self-assembling-zones
smklein Apr 20, 2023
e9229bf
Fix Clickhouse manifests
smklein Apr 20, 2023
be30a16
Update crucible
smklein Apr 21, 2023
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
38 changes: 38 additions & 0 deletions Cargo.lock

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

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,7 @@ petgraph = "0.6.3"
pin-project-lite = "0.2.9"
postgres-protocol = "0.6.5"
predicates = "3.0.3"
pretty_assertions = "1.3.0"
pretty-hex = "0.3.0"
proc-macro2 = "1.0"
progenitor = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
Expand Down
8 changes: 8 additions & 0 deletions illumos-utils/src/running_zone.rs
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,14 @@ impl InstalledZone {
zone_name
}

pub fn get_control_vnic_name(&self) -> &str {
self.control_vnic.name()
}

pub fn name(&self) -> &str {
&self.name
}

#[allow(clippy::too_many_arguments)]
pub async fn install(
log: &Logger,
Expand Down
8 changes: 4 additions & 4 deletions package-manifest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -221,21 +221,21 @@ only_for_targets.image = "standard"
# 3. Use source.type = "manual" instead of "prebuilt"
source.type = "prebuilt"
source.repo = "crucible"
source.commit = "fb671895e8adb3cab5e801bbbe8728997178aba4"
source.commit = "7c5c87a06b62f3f90e26766a8abdd80a8e050f15"
# The SHA256 digest is automatically posted to:
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible.sha256.txt
source.sha256 = "227761dcba9372619c71fcf7137a7a98c4d618192cbaa6f41031c4429ab99c04"
source.sha256 = "bcc555a5b8d075643c304126dd7e4d9605da6ffc7c8bd8d123e5469be99f0c18"
output.type = "zone"

[package.crucible-pantry]
service_name = "crucible_pantry"
only_for_targets.image = "standard"
source.type = "prebuilt"
source.repo = "crucible"
source.commit = "fb671895e8adb3cab5e801bbbe8728997178aba4"
source.commit = "7c5c87a06b62f3f90e26766a8abdd80a8e050f15"
# The SHA256 digest is automatically posted to:
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible-pantry.sha256.txt
source.sha256 = "bf648339cfd010bad65186584fe34108cc1f27162c62e11f1d18b1fe89a43ddc"
source.sha256 = "055d45104067559032105a13ae8f4895eea7ebcb708b56d195a0006e731e670e"
output.type = "zone"

# Refer to
Expand Down
1 change: 1 addition & 0 deletions sled-agent/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ mockall.workspace = true
omicron-test-utils.workspace = true
openapi-lint.workspace = true
openapiv3.workspace = true
pretty_assertions.workspace = true
serial_test.workspace = true
subprocess.workspace = true
slog-async.workspace = true
Expand Down
1 change: 1 addition & 0 deletions sled-agent/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ mod instance;
mod instance_manager;
mod nexus;
pub mod params;
mod profile;
pub mod rack_setup;
pub mod server;
mod services;
Expand Down
Loading