Pull in updated Propolis with new VM timeseries, and expunge the old (#…

…6169) - Pulls in Propolis #724, which added sled-identifiers to the virtual machine timeseries. One part of #5267. - Updates requried Crucible dependency - Expunge previous schema and data for the virtual machine timeseries, as the new schema is incompatible.
oxidecomputer · Jul 30, 2024 · b74d691 · b74d691
1 parent 237841e
commit b74d691
Show file tree

Hide file tree

Showing 14 changed files with 145 additions and 95 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -291,9 +291,9 @@ cookie = "0.18"
 criterion = { version = "0.5.1", features = [ "async_tokio" ] }
 crossbeam = "0.8"
 crossterm = { version = "0.27.0", features = ["event-stream"] }
-crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "e10f8793f8414fdb9a165219f17e45fa014d088b" }
-crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "e10f8793f8414fdb9a165219f17e45fa014d088b" }
-crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "e10f8793f8414fdb9a165219f17e45fa014d088b" }
+crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "e58ca3693cb9ce0438947beba10e97ee38a0966b" }
+crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "e58ca3693cb9ce0438947beba10e97ee38a0966b" }
+crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "e58ca3693cb9ce0438947beba10e97ee38a0966b" }
 csv = "1.3.0"
 curve25519-dalek = "4"
 datatest-stable = "0.2.9"
@@ -455,9 +455,9 @@ prettyplease = { version = "0.2.20", features = ["verbatim"] }
 proc-macro2 = "1.0"
 progenitor = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
 progenitor-client = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
-bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "66d1ee7d4a5829dbbf02a152091ea051023b5b8b" }
-propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "66d1ee7d4a5829dbbf02a152091ea051023b5b8b" }
-propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "66d1ee7d4a5829dbbf02a152091ea051023b5b8b" }
+bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "24a74d0c76b6a63961ecef76acb1516b6e66c5c9" }
+propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "24a74d0c76b6a63961ecef76acb1516b6e66c5c9" }
+propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "24a74d0c76b6a63961ecef76acb1516b6e66c5c9" }
 proptest = "1.4.0"
 quote = "1.0"
 rand = "0.8.5"

diff --git a/docs/how-to-run.adoc b/docs/how-to-run.adoc
@@ -520,13 +520,11 @@ In this example we'll update the recovery silo so we can provision instances dir
 
 [source, console]
 ----
-$ oxide api /v1/system/silos/recovery/quotas --method PUT --input - <<EOF
-{
-  "cpus": 9999999999,
-  "memory": 999999999999999999,
-  "storage": 999999999999999999
-}
-EOF
+$ oxide silo quotas update \
+    --silo fa12b74d-30f8-4d5a-bc0e-4d229f13c6e5 \
+    --cpus 9999999999 \
+    --memory 999999999999999999 \
+    --storage 999999999999999999
 
 # example response
 {
@@ -544,12 +542,7 @@ An IP pool is needed to provide external connectivity to Instances.  The address
 Here we will first create an ip pool for the recovery silo:
 [source,console]
 ----
-$ oxide api /v1/system/ip-pools --method POST --input - <<EOF
-{
-  "name": "default",
-  "description": "default ip-pool"
-}
-EOF
+$ oxide ip-pool create --name "default" --description "default ip-pool"
 
 # example response
 {
@@ -561,15 +554,10 @@ EOF
 }
 ----
 
-Now we will associate the pool with the recovery silo.
+Now we will associate (link) the pool with the recovery silo.
 [source,console]
 ----
-$ oxide api /v1/system/ip-pools/default/silos --method POST --input - <<EOF
-{
-  "silo": "recovery",
-  "is_default": true
-}
-EOF
+$ oxide ip-pool silo link --pool default --is-default true --silo recovery
 
 # example response
 {
@@ -583,12 +571,7 @@ Now we will add an address range to the recovery silo:
 
 [source,console]
 ----
-oxide api /v1/system/ip-pools/default/ranges/add --method POST --input - <<EOF
-{
-  "first": "$IP_POOL_START",
-  "last": "$IP_POOL_END"
-}
-EOF
+oxide ip-pool range add --pool default --first $IP_POOL_START --last $IP_POOL_END
 
 # example response
 {

diff --git a/oximeter/db/schema/replicated/6/timeseries-to-delete.txt b/oximeter/db/schema/replicated/6/timeseries-to-delete.txt
@@ -0,0 +1,8 @@
+bfd_session:message_recieve_error
+instance_uuid:pv_panic_guest_handled
+instance_uuid:pv_panic_host_handled
+instance_uuid:reset
+virtual_machine:pv_panic_guest_handled
+virtual_machine:pv_panic_host_handled
+virtual_machine:reset
+virtual_machine:vcpu_usage
diff --git a/oximeter/db/schema/single-node/6/timeseries-to-delete.txt b/oximeter/db/schema/single-node/6/timeseries-to-delete.txt
@@ -0,0 +1,8 @@
+bfd_session:message_recieve_error
+instance_uuid:pv_panic_guest_handled
+instance_uuid:pv_panic_host_handled
+instance_uuid:reset
+virtual_machine:pv_panic_guest_handled
+virtual_machine:pv_panic_host_handled
+virtual_machine:reset
+virtual_machine:vcpu_usage
diff --git a/oximeter/db/src/model.rs b/oximeter/db/src/model.rs
@@ -45,7 +45,7 @@ use uuid::Uuid;
 /// - [`crate::Client::initialize_db_with_version`]
 /// - [`crate::Client::ensure_schema`]
 /// - The `clickhouse-schema-updater` binary in this crate
-pub const OXIMETER_VERSION: u64 = 5;
+pub const OXIMETER_VERSION: u64 = 6;
 
 // Wrapper type to represent a boolean in the database.
 //

diff --git a/package-manifest.toml b/package-manifest.toml
@@ -519,10 +519,10 @@ only_for_targets.image = "standard"
 # 3. Use source.type = "manual" instead of "prebuilt"
 source.type = "prebuilt"
 source.repo = "crucible"
-source.commit = "e10f8793f8414fdb9a165219f17e45fa014d088b"
+source.commit = "e58ca3693cb9ce0438947beba10e97ee38a0966b"
 # The SHA256 digest is automatically posted to:
 # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible.sha256.txt
-source.sha256 = "e3f7ace2da974da6379485c6871ffc88ce7430c9ff519d5ac9dc04c55ce9f189"
+source.sha256 = "18dc942935af51ea03161498c44b56bb85b4a5d2499a5ff19ba87c0284e34742"
 output.type = "zone"
 output.intermediate_only = true
 
@@ -531,10 +531,10 @@ service_name = "crucible_pantry_prebuilt"
 only_for_targets.image = "standard"
 source.type = "prebuilt"
 source.repo = "crucible"
-source.commit = "e10f8793f8414fdb9a165219f17e45fa014d088b"
+source.commit = "e58ca3693cb9ce0438947beba10e97ee38a0966b"
 # The SHA256 digest is automatically posted to:
 # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible-pantry.sha256.txt
-source.sha256 = "a5505a51871e910735f449acb6887610a08244773e19d474f66cb00e533842d0"
+source.sha256 = "9067426bb77ce091116a034a19abb96ecd98cc8ac228a147bd3c3283e40d527d"
 output.type = "zone"
 output.intermediate_only = true
 
@@ -548,10 +548,10 @@ service_name = "crucible_dtrace"
 only_for_targets.image = "standard"
 source.type = "prebuilt"
 source.repo = "crucible"
-source.commit = "e10f8793f8414fdb9a165219f17e45fa014d088b"
+source.commit = "e58ca3693cb9ce0438947beba10e97ee38a0966b"
 # The SHA256 digest is automatically posted to:
 # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible-dtrace.sha256.txt
-source.sha256 = "29e79e0df79fc46b244745fac807b0e1817954c0a17b1923d725f257d31010e9"
+source.sha256 = "660e04fdcbacda66e5012ba4ba6cf1022a4d80453da165b1507d97b7386f2691"
 output.type = "tarball"
 
 # Refer to
@@ -562,10 +562,10 @@ service_name = "propolis-server"
 only_for_targets.image = "standard"
 source.type = "prebuilt"
 source.repo = "propolis"
-source.commit = "66d1ee7d4a5829dbbf02a152091ea051023b5b8b"
+source.commit = "24a74d0c76b6a63961ecef76acb1516b6e66c5c9"
 # The SHA256 digest is automatically posted to:
 # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/propolis/image/<commit>/propolis-server.sha256.txt
-source.sha256 = "168d4f061245bae749926104a77d087d144ee4aea8cc6d2a49284ee26ad5ffe9"
+source.sha256 = "e716c1fa5c4ee402f8e3a63f667bbcda744f378305f91ff333bebafe5c20d60b"
 output.type = "zone"
 
 [package.mg-ddm-gz]

diff --git a/sled-agent/src/http_entrypoints.rs b/sled-agent/src/http_entrypoints.rs
@@ -1023,7 +1023,7 @@ async fn inventory(
 async fn sled_identifiers(
     request_context: RequestContext<SledAgent>,
 ) -> Result<HttpResponseOk<SledIdentifiers>, HttpError> {
-    Ok(HttpResponseOk(request_context.context().sled_identifiers().await))
+    Ok(HttpResponseOk(request_context.context().sled_identifiers()))
 }
 
 /// Get the internal state of the local bootstore node