Merge branch 'main' into use-nw-service

Author: karencfv

Cargo.lock

@@ -33,11 +33,11 @@ resolver = "2"
 aes-gcm-siv = "0.11.1"
 anyhow = "1"
 async-recursion = "1.0.5"
-async-trait = "0.1.75"
+async-trait = "0.1.77"
 atty = "0.2.14"
-base64 = "0.21.5"
+base64 = "0.21.7"
 bincode = "1.3"
-byte-unit = "5.1.2"
+byte-unit = "5.1.4"
 bytes = { version = "1", features = ["serde"] }
 chrono = { version = "0.4", features = [ "serde" ] }
 clap = { version = "4.4", features = ["derive", "env", "wrap_help"] }
@@ -54,11 +54,11 @@ httptest = "0.15.5"
 hyper = { version = "0.14", features = [ "full" ] }
 hyper-staticfile = "0.9"
 indicatif = { version = "0.17.7", features = ["rayon"] }
-itertools = "0.12.0"
+itertools = "0.12.1"
 libc = "0.2"
 mime_guess = "2.0.4"
 nbd = "0.2.3"
-nix = { version = "0.26", features = [ "feature", "uio" ] }
+nix = { version = "0.27", features = [ "feature", "uio" ] }
 num_enum = "0.7"
 num-derive = "0.4"
 num-traits = "0.2"
@@ -68,10 +68,10 @@ opentelemetry = "0.21.0"
 opentelemetry-jaeger = { version = "0.20.0" }
 percent-encoding = "2.3"
 proptest = "1.4.0"
-rayon = "1.8.0"
+rayon = "1.8.1"
 rand = { version = "0.8.5", features = ["min_const_gen", "small_rng"] }
 rand_chacha = "0.3.1"
-reedline = "0.27.1"
+reedline = "0.28.0"
 reqwest = { version = "0.11", features = ["default", "blocking", "json", "stream"] }
 ringbuffer = "0.15.0"
 rusqlite = { version = "0.30" }
@@ -84,7 +84,7 @@ signal-hook = "0.3.17"
 signal-hook-tokio = { version = "0.3.1", features = ["futures-v0_3"] }
 slog = { version = "2.7", features = ["max_level_trace", "release_max_level_debug"] }
 slog-async = { version = "2.8" }
-slog-bunyan = "2.4.0"
+slog-bunyan = "2.5.0"
 slog-dtrace = "0.3"
 slog-term = { version = "2.9" }
 static_assertions = "1.1.0"
@@ -94,7 +94,7 @@ strum_macros = "0.25.3"
 tempfile = "3"
 test-strategy = "0.3.1"
 thiserror = "1"
-tokio = { version = "1.35", features = ["full"] }
+tokio = { version = "1.36", features = ["full"] }
 tokio-rustls = { version = "0.24.1" }
 tokio-test = "*"
 tokio-util = { version = "0.7", features = ["codec"]}

Cargo.toml

@@ -158,6 +158,9 @@ pub enum CrucibleError {
 
     #[error("missing block context for non-empty block")]
     MissingBlockContext,
+
+    #[error("Incompatible RegionDefinition {0}")]
+    RegionIncompatible(String),
 }
 
 impl From<std::io::Error> for CrucibleError {
@@ -363,6 +366,7 @@ impl From<CrucibleError> for dropshot::HttpError {
             | CrucibleError::ModifyingReadOnlyRegion
             | CrucibleError::OffsetInvalid
             | CrucibleError::OffsetUnaligned
+            | CrucibleError::RegionIncompatible(_)
             | CrucibleError::ReplaceRequestInvalid(_)
             | CrucibleError::SnapshotExistsAlready(_)
             | CrucibleError::Unsupported(_) => {