From 580474dfe8dc58ecb47ca7605ad1b550ec619cd7 Mon Sep 17 00:00:00 2001 From: Alan Hanson Date: Wed, 2 Apr 2025 23:46:50 +0000 Subject: [PATCH 1/7] Temp branch and PR, ignore me --- Cargo.lock | 27 +++++++++++++++++++++++---- Cargo.toml | 4 ++-- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2bcc283a7..a3ca66028 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -826,7 +826,7 @@ checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crucible" version = "0.0.1" -source = "git+https://github.com/oxidecomputer/crucible?rev=da3cf198a0e000bb89efc3a1c77d7ba09340a600#da3cf198a0e000bb89efc3a1c77d7ba09340a600" +source = "git+https://github.com/oxidecomputer/crucible?rev=e1a16bae47eacfb1414d956f1eab51c9ab1ad6a3#e1a16bae47eacfb1414d956f1eab51c9ab1ad6a3" dependencies = [ "aes-gcm-siv", "anyhow", @@ -842,6 +842,7 @@ dependencies = [ "crucible-protocol", "crucible-workspace-hack", "dropshot", + "fakedata_generator", "futures", "futures-core", "internal-dns-resolver", @@ -879,7 +880,7 @@ dependencies = [ [[package]] name = "crucible-client-types" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/crucible?rev=da3cf198a0e000bb89efc3a1c77d7ba09340a600#da3cf198a0e000bb89efc3a1c77d7ba09340a600" +source = "git+https://github.com/oxidecomputer/crucible?rev=e1a16bae47eacfb1414d956f1eab51c9ab1ad6a3#e1a16bae47eacfb1414d956f1eab51c9ab1ad6a3" dependencies = [ "base64 0.22.1", "crucible-workspace-hack", @@ -892,7 +893,7 @@ dependencies = [ [[package]] name = "crucible-common" version = "0.0.1" -source = "git+https://github.com/oxidecomputer/crucible?rev=da3cf198a0e000bb89efc3a1c77d7ba09340a600#da3cf198a0e000bb89efc3a1c77d7ba09340a600" +source = "git+https://github.com/oxidecomputer/crucible?rev=e1a16bae47eacfb1414d956f1eab51c9ab1ad6a3#e1a16bae47eacfb1414d956f1eab51c9ab1ad6a3" dependencies = [ "anyhow", "atty", @@ -921,7 +922,7 @@ dependencies = [ [[package]] name = "crucible-protocol" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/crucible?rev=da3cf198a0e000bb89efc3a1c77d7ba09340a600#da3cf198a0e000bb89efc3a1c77d7ba09340a600" +source = "git+https://github.com/oxidecomputer/crucible?rev=e1a16bae47eacfb1414d956f1eab51c9ab1ad6a3#e1a16bae47eacfb1414d956f1eab51c9ab1ad6a3" dependencies = [ "anyhow", "bincode", @@ -1494,6 +1495,18 @@ dependencies = [ "similar", ] +[[package]] +name = "fakedata_generator" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57b82fba4b485b819fde74012109688a9d2bd4ce7b22583ac12c9fa239f74a02" +dependencies = [ + "passt", + "rand 0.8.5", + "serde", + "serde_json", +] + [[package]] name = "fastrand" version = "2.1.0" @@ -3969,6 +3982,12 @@ dependencies = [ "syn 2.0.100", ] +[[package]] +name = "passt" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13242a5ce97f39a8095d03c8b273e91d09f2690c0b7d69a2af844941115bab24" + [[package]] name = "password-hash" version = "0.5.0" diff --git a/Cargo.toml b/Cargo.toml index 7611290d5..4300344e1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -86,8 +86,8 @@ oximeter = { git = "https://github.com/oxidecomputer/omicron", branch = "main" } sled-agent-client = { git = "https://github.com/oxidecomputer/omicron", branch = "main" } # Crucible -crucible = { git = "https://github.com/oxidecomputer/crucible", rev = "da3cf198a0e000bb89efc3a1c77d7ba09340a600" } -crucible-client-types = { git = "https://github.com/oxidecomputer/crucible", rev = "da3cf198a0e000bb89efc3a1c77d7ba09340a600" } +crucible = { git = "https://github.com/oxidecomputer/crucible", rev = "e1a16bae47eacfb1414d956f1eab51c9ab1ad6a3" } +crucible-client-types = { git = "https://github.com/oxidecomputer/crucible", rev = "e1a16bae47eacfb1414d956f1eab51c9ab1ad6a3" } # External dependencies anyhow = "1.0" From dde7c2b7ee8ae38f60aee7942586cd68bffee972 Mon Sep 17 00:00:00 2001 From: Alan Hanson Date: Wed, 2 Apr 2025 23:55:53 +0000 Subject: [PATCH 2/7] toml --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 4300344e1..39f94f8b1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -107,7 +107,7 @@ cargo_metadata = "0.18.1" cc = "1.0.73" cfg-if = "1.0.0" chrono = "0.4.19" -clap = "4.2" +clap = "4.5" const_format = "0.2" crossbeam-channel = "0.5" ctrlc = "3.2" From 723c5b3e7d69e532eb8426aa2b1964fe31dd0f7a Mon Sep 17 00:00:00 2001 From: Alan Hanson Date: Tue, 8 Apr 2025 18:20:11 +0000 Subject: [PATCH 3/7] bump the crucible pointer --- Cargo.lock | 8 ++++---- Cargo.toml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a3ca66028..fc7a8dcc4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -826,7 +826,7 @@ checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crucible" version = "0.0.1" -source = "git+https://github.com/oxidecomputer/crucible?rev=e1a16bae47eacfb1414d956f1eab51c9ab1ad6a3#e1a16bae47eacfb1414d956f1eab51c9ab1ad6a3" +source = "git+https://github.com/oxidecomputer/crucible?rev=b2b5800c40982113a3f727dca9c6a1e36916ab47#b2b5800c40982113a3f727dca9c6a1e36916ab47" dependencies = [ "aes-gcm-siv", "anyhow", @@ -880,7 +880,7 @@ dependencies = [ [[package]] name = "crucible-client-types" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/crucible?rev=e1a16bae47eacfb1414d956f1eab51c9ab1ad6a3#e1a16bae47eacfb1414d956f1eab51c9ab1ad6a3" +source = "git+https://github.com/oxidecomputer/crucible?rev=b2b5800c40982113a3f727dca9c6a1e36916ab47#b2b5800c40982113a3f727dca9c6a1e36916ab47" dependencies = [ "base64 0.22.1", "crucible-workspace-hack", @@ -893,7 +893,7 @@ dependencies = [ [[package]] name = "crucible-common" version = "0.0.1" -source = "git+https://github.com/oxidecomputer/crucible?rev=e1a16bae47eacfb1414d956f1eab51c9ab1ad6a3#e1a16bae47eacfb1414d956f1eab51c9ab1ad6a3" +source = "git+https://github.com/oxidecomputer/crucible?rev=b2b5800c40982113a3f727dca9c6a1e36916ab47#b2b5800c40982113a3f727dca9c6a1e36916ab47" dependencies = [ "anyhow", "atty", @@ -922,7 +922,7 @@ dependencies = [ [[package]] name = "crucible-protocol" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/crucible?rev=e1a16bae47eacfb1414d956f1eab51c9ab1ad6a3#e1a16bae47eacfb1414d956f1eab51c9ab1ad6a3" +source = "git+https://github.com/oxidecomputer/crucible?rev=b2b5800c40982113a3f727dca9c6a1e36916ab47#b2b5800c40982113a3f727dca9c6a1e36916ab47" dependencies = [ "anyhow", "bincode", diff --git a/Cargo.toml b/Cargo.toml index 39f94f8b1..0bc178bd0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -86,8 +86,8 @@ oximeter = { git = "https://github.com/oxidecomputer/omicron", branch = "main" } sled-agent-client = { git = "https://github.com/oxidecomputer/omicron", branch = "main" } # Crucible -crucible = { git = "https://github.com/oxidecomputer/crucible", rev = "e1a16bae47eacfb1414d956f1eab51c9ab1ad6a3" } -crucible-client-types = { git = "https://github.com/oxidecomputer/crucible", rev = "e1a16bae47eacfb1414d956f1eab51c9ab1ad6a3" } +crucible = { git = "https://github.com/oxidecomputer/crucible", rev = "b2b5800c40982113a3f727dca9c6a1e36916ab47" } +crucible-client-types = { git = "https://github.com/oxidecomputer/crucible", rev = "b2b5800c40982113a3f727dca9c6a1e36916ab47" } # External dependencies anyhow = "1.0" From 9535be219dae4b449dcbfa3d32c51c4c0b3805f8 Mon Sep 17 00:00:00 2001 From: Alan Hanson Date: Fri, 18 Apr 2025 01:41:09 +0000 Subject: [PATCH 4/7] debug info --- Cargo.toml | 4 ++-- bin/propolis-server/src/lib/vm/state_driver.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 0bc178bd0..9c9723a7e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -86,8 +86,8 @@ oximeter = { git = "https://github.com/oxidecomputer/omicron", branch = "main" } sled-agent-client = { git = "https://github.com/oxidecomputer/omicron", branch = "main" } # Crucible -crucible = { git = "https://github.com/oxidecomputer/crucible", rev = "b2b5800c40982113a3f727dca9c6a1e36916ab47" } -crucible-client-types = { git = "https://github.com/oxidecomputer/crucible", rev = "b2b5800c40982113a3f727dca9c6a1e36916ab47" } +crucible = { git = "https://github.com/oxidecomputer/crucible", rev = "e0cae8aa2013a86be56e5d7cbae177ad68c4eac9" } +crucible-client-types = { git = "https://github.com/oxidecomputer/crucible", rev = "e0cae8aa2013a86be56e5d7cbae177ad68c4eac9" } # External dependencies anyhow = "1.0" diff --git a/bin/propolis-server/src/lib/vm/state_driver.rs b/bin/propolis-server/src/lib/vm/state_driver.rs index 22354578f..f12faa1e3 100644 --- a/bin/propolis-server/src/lib/vm/state_driver.rs +++ b/bin/propolis-server/src/lib/vm/state_driver.rs @@ -1014,7 +1014,7 @@ impl StateDriver { backend_id: &SpecKey, new_vcr_json: String, ) -> super::CrucibleReplaceResult { - info!(self.log, "request to replace Crucible VCR"; + info!(self.log, "request to replace Crucible VCR {:?}", new_vcr_json; "backend_id" => %backend_id); let mut objects = self.objects.lock_exclusive().await; From 6474182c02ba2501fa6a7c8c1a994a7c52a2e9a6 Mon Sep 17 00:00:00 2001 From: Alan Hanson Date: Thu, 24 Apr 2025 00:14:46 +0000 Subject: [PATCH 5/7] bump crucible test version --- Cargo.lock | 8 ++++---- Cargo.toml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fc7a8dcc4..5440adc71 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -826,7 +826,7 @@ checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crucible" version = "0.0.1" -source = "git+https://github.com/oxidecomputer/crucible?rev=b2b5800c40982113a3f727dca9c6a1e36916ab47#b2b5800c40982113a3f727dca9c6a1e36916ab47" +source = "git+https://github.com/oxidecomputer/crucible?rev=8ba45afebdfe819d5eb3bf32e25e5d3fecb48381#8ba45afebdfe819d5eb3bf32e25e5d3fecb48381" dependencies = [ "aes-gcm-siv", "anyhow", @@ -880,7 +880,7 @@ dependencies = [ [[package]] name = "crucible-client-types" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/crucible?rev=b2b5800c40982113a3f727dca9c6a1e36916ab47#b2b5800c40982113a3f727dca9c6a1e36916ab47" +source = "git+https://github.com/oxidecomputer/crucible?rev=8ba45afebdfe819d5eb3bf32e25e5d3fecb48381#8ba45afebdfe819d5eb3bf32e25e5d3fecb48381" dependencies = [ "base64 0.22.1", "crucible-workspace-hack", @@ -893,7 +893,7 @@ dependencies = [ [[package]] name = "crucible-common" version = "0.0.1" -source = "git+https://github.com/oxidecomputer/crucible?rev=b2b5800c40982113a3f727dca9c6a1e36916ab47#b2b5800c40982113a3f727dca9c6a1e36916ab47" +source = "git+https://github.com/oxidecomputer/crucible?rev=8ba45afebdfe819d5eb3bf32e25e5d3fecb48381#8ba45afebdfe819d5eb3bf32e25e5d3fecb48381" dependencies = [ "anyhow", "atty", @@ -922,7 +922,7 @@ dependencies = [ [[package]] name = "crucible-protocol" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/crucible?rev=b2b5800c40982113a3f727dca9c6a1e36916ab47#b2b5800c40982113a3f727dca9c6a1e36916ab47" +source = "git+https://github.com/oxidecomputer/crucible?rev=8ba45afebdfe819d5eb3bf32e25e5d3fecb48381#8ba45afebdfe819d5eb3bf32e25e5d3fecb48381" dependencies = [ "anyhow", "bincode", diff --git a/Cargo.toml b/Cargo.toml index 9c9723a7e..79c63fecd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -86,8 +86,8 @@ oximeter = { git = "https://github.com/oxidecomputer/omicron", branch = "main" } sled-agent-client = { git = "https://github.com/oxidecomputer/omicron", branch = "main" } # Crucible -crucible = { git = "https://github.com/oxidecomputer/crucible", rev = "e0cae8aa2013a86be56e5d7cbae177ad68c4eac9" } -crucible-client-types = { git = "https://github.com/oxidecomputer/crucible", rev = "e0cae8aa2013a86be56e5d7cbae177ad68c4eac9" } +crucible = { git = "https://github.com/oxidecomputer/crucible", rev = "96c6475054e411092765d613144c6a7bfbf3c96a" } +crucible-client-types = { git = "https://github.com/oxidecomputer/crucible", rev = "96c6475054e411092765d613144c6a7bfbf3c96a" } # External dependencies anyhow = "1.0" From 18e297986b3caef04cf549cbe4550f8e8c4ee112 Mon Sep 17 00:00:00 2001 From: Alan Hanson Date: Thu, 24 Apr 2025 04:46:30 +0000 Subject: [PATCH 6/7] Merge main, update --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 6438558fa..9cf35e528 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -86,8 +86,8 @@ oximeter = { git = "https://github.com/oxidecomputer/omicron", branch = "main" } sled-agent-client = { git = "https://github.com/oxidecomputer/omicron", branch = "main" } # Crucible -crucible = { git = "https://github.com/oxidecomputer/crucible", rev = "96c6475054e411092765d613144c6a7bfbf3c96a" } -crucible-client-types = { git = "https://github.com/oxidecomputer/crucible", rev = "96c6475054e411092765d613144c6a7bfbf3c96a" } +crucible = { git = "https://github.com/oxidecomputer/crucible", rev = "2c8b2aeffca9ab377dacee4557c2cc994694b00d" } +crucible-client-types = { git = "https://github.com/oxidecomputer/crucible", rev = "2c8b2aeffca9ab377dacee4557c2cc994694b00d" } # External dependencies anyhow = "1.0" From 2a69244091453a4d26564d6732137b173faff3e0 Mon Sep 17 00:00:00 2001 From: Alan Hanson Date: Thu, 24 Apr 2025 04:48:27 +0000 Subject: [PATCH 7/7] update lock --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b136dd19a..83d82cfdf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -826,7 +826,7 @@ checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crucible" version = "0.0.1" -source = "git+https://github.com/oxidecomputer/crucible?rev=8ba45afebdfe819d5eb3bf32e25e5d3fecb48381#8ba45afebdfe819d5eb3bf32e25e5d3fecb48381" +source = "git+https://github.com/oxidecomputer/crucible?rev=2c8b2aeffca9ab377dacee4557c2cc994694b00d#2c8b2aeffca9ab377dacee4557c2cc994694b00d" dependencies = [ "aes-gcm-siv", "anyhow", @@ -880,7 +880,7 @@ dependencies = [ [[package]] name = "crucible-client-types" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/crucible?rev=8ba45afebdfe819d5eb3bf32e25e5d3fecb48381#8ba45afebdfe819d5eb3bf32e25e5d3fecb48381" +source = "git+https://github.com/oxidecomputer/crucible?rev=2c8b2aeffca9ab377dacee4557c2cc994694b00d#2c8b2aeffca9ab377dacee4557c2cc994694b00d" dependencies = [ "base64 0.22.1", "crucible-workspace-hack", @@ -893,7 +893,7 @@ dependencies = [ [[package]] name = "crucible-common" version = "0.0.1" -source = "git+https://github.com/oxidecomputer/crucible?rev=8ba45afebdfe819d5eb3bf32e25e5d3fecb48381#8ba45afebdfe819d5eb3bf32e25e5d3fecb48381" +source = "git+https://github.com/oxidecomputer/crucible?rev=2c8b2aeffca9ab377dacee4557c2cc994694b00d#2c8b2aeffca9ab377dacee4557c2cc994694b00d" dependencies = [ "anyhow", "atty", @@ -922,7 +922,7 @@ dependencies = [ [[package]] name = "crucible-protocol" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/crucible?rev=8ba45afebdfe819d5eb3bf32e25e5d3fecb48381#8ba45afebdfe819d5eb3bf32e25e5d3fecb48381" +source = "git+https://github.com/oxidecomputer/crucible?rev=2c8b2aeffca9ab377dacee4557c2cc994694b00d#2c8b2aeffca9ab377dacee4557c2cc994694b00d" dependencies = [ "anyhow", "bincode",