Skip to content

Commit aa386c4

Browse files
authored
[sled-agent-config-reconciler] Flesh out dataset serialization task (#8088)
1 parent ad7c3b9 commit aa386c4

File tree

11 files changed

+2493
-64
lines changed

11 files changed

+2493
-64
lines changed

Cargo.lock

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

illumos-utils/src/zfs.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ pub enum DestroyDatasetErrorVariant {
5858

5959
/// Error returned by [`Zfs::destroy_dataset`].
6060
#[derive(thiserror::Error, Debug)]
61-
#[error("Could not destroy dataset {name}: {err}")]
61+
#[error("Could not destroy dataset {name}")]
6262
pub struct DestroyDatasetError {
63-
name: String,
63+
pub name: String,
6464
#[source]
6565
pub err: DestroyDatasetErrorVariant,
6666
}
@@ -282,7 +282,7 @@ pub struct SizeDetails {
282282
pub compression: CompressionAlgorithm,
283283
}
284284

285-
#[derive(Debug)]
285+
#[derive(Debug, Clone)]
286286
pub struct DatasetProperties {
287287
/// The Uuid of the dataset
288288
pub id: Option<DatasetUuid>,

sled-agent/config-reconciler/Cargo.toml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ async-trait.workspace = true
1313
camino.workspace = true
1414
camino-tempfile.workspace = true
1515
chrono.workspace = true
16+
debug-ignore.workspace = true
1617
derive_more.workspace = true
1718
dropshot.workspace = true
1819
futures.workspace = true
@@ -34,16 +35,19 @@ thiserror.workspace = true
3435
tokio.workspace = true
3536
tufaceous-artifact.workspace = true
3637
zone.workspace = true
38+
3739
omicron-workspace-hack.workspace = true
3840

3941
[dev-dependencies]
42+
assert_matches.workspace = true
4043
expectorate.workspace = true
4144
omicron-test-utils.workspace = true
4245
proptest.workspace = true
4346
scopeguard.workspace = true
4447
serde_json.workspace = true
45-
test-strategy.workspace = true
4648
sled-storage = { workspace = true, features = ["testing"] }
49+
test-strategy.workspace = true
50+
xshell.workspace = true
4751

4852
[features]
4953
testing = []
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Seeds for failure cases proptest has generated in the past. It is
2+
# automatically read and these particular cases re-run before any
3+
# novel cases are generated.
4+
#
5+
# It is recommended to check this file in to source control so that
6+
# everyone who runs the test benefits from these saved cases.
7+
cc 83e4a7eb0fa4ce143d0026c5ab0a7abca8cfa2101140ba6b4e5f6aadec8928c6 # shrinks to input = _TransientZoneDatasetsSkippedIfNoTransientZoneRootArgs { pools: {ArbitraryZpoolName { name: ZpoolName { id: 00000000-0000-0000-0000-000000000000 (zpool), kind: External } }: Fail} }

0 commit comments

Comments
 (0)