Disk creation/deletion allocates Crucible regions via sagas

common/src/api/external/mod.rs

@@ -399,7 +399,7 @@ impl JsonSchema for RoleName {
  * the database as an i64.  Constraining it here ensures that we can't fail to
  * serialize the value.
  */
-#[derive(Copy, Clone, Debug, Deserialize, Serialize, JsonSchema)]
+#[derive(Copy, Clone, Debug, Deserialize, Serialize, JsonSchema, PartialEq)]
 pub struct ByteCount(u64);
 
 impl ByteCount {
@@ -468,8 +468,8 @@ impl From<u32> for ByteCount {
     }
 }
 
-impl From<&ByteCount> for i64 {
-    fn from(b: &ByteCount) -> Self {
+impl From<ByteCount> for i64 {
+    fn from(b: ByteCount) -> Self {
         /* We have already validated that this value is in range. */
         i64::try_from(b.0).unwrap()
     }
@@ -2072,12 +2072,12 @@ mod test {
         /* Largest supported value: both constructors that support it. */
         let max = ByteCount::try_from(i64::MAX).unwrap();
         assert_eq!(i64::MAX, max.to_bytes() as i64);
-        assert_eq!(i64::MAX, i64::from(&max));
+        assert_eq!(i64::MAX, i64::from(max));
 
         let maxu64 = u64::try_from(i64::MAX).unwrap();
         let max = ByteCount::try_from(maxu64).unwrap();
         assert_eq!(i64::MAX, max.to_bytes() as i64);
-        assert_eq!(i64::MAX, i64::from(&max));
+        assert_eq!(i64::MAX, i64::from(max));
         assert_eq!(
             (i64::MAX / 1024 / 1024 / 1024 / 1024) as u64,
             max.to_whole_tebibytes()

common/src/sql/dbinit.sql

@@ -105,13 +105,21 @@ CREATE TABLE omicron.public.Dataset (
     /* FK into the Pool table */
     pool_id UUID NOT NULL,
 
-    /* Contact information for the downstairs region */
+    /* Contact information for the dataset */
     ip INET NOT NULL,
     port INT4 NOT NULL,
 
-    kind omicron.public.dataset_kind NOT NULL
+    kind omicron.public.dataset_kind NOT NULL,
+
+    /* An upper bound on the amount of space that might be in-use */
+    size_used INT
 );
 
+/* Create an index on the size usage for Crucible's allocation */
+CREATE INDEX on omicron.public.Dataset (
+    size_used
+) WHERE size_used IS NOT NULL AND time_deleted IS NULL AND kind = 'crucible';
+
 /*
  * A region of space allocated to Crucible Downstairs, within a dataset.
  */
@@ -129,10 +137,17 @@ CREATE TABLE omicron.public.Region (
 
     /* Metadata describing the region */
     block_size INT NOT NULL,
-    extent_size INT NOT NULL,
+    blocks_per_extent INT NOT NULL,
     extent_count INT NOT NULL
 );
 
+/*
+ * Allow all regions belonging to a disk to be accessed quickly.
+ */
+CREATE INDEX on omicron.public.Region (
+    disk_id
+);
+
 /*
  * Organizations
  */

nexus/Cargo.toml

@@ -9,10 +9,11 @@ path = "../rpaths"
 
 [dependencies]
 anyhow = "1.0"
+async-bb8-diesel = { git = "https://github.com/oxidecomputer/async-bb8-diesel", rev = "c849b717be" }
 async-trait = "0.1.51"
 bb8 = "0.7.1"
-async-bb8-diesel = { git = "https://github.com/oxidecomputer/async-bb8-diesel", rev = "c849b717be" }
 cookie = "0.16"
+crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "078d364e14d57d5faa3a44001c65709935419779" }
 # Tracking pending 2.0 version.
 diesel = { git = "https://github.com/diesel-rs/diesel", rev = "ce77c382", features = ["postgres", "r2d2", "chrono", "serde_json", "network-address", "uuid"] }
 futures = "0.3.18"