Merge branch 'main' into oximeter-stable

.github/workflows/check-opte-ver.yml

@@ -9,7 +9,7 @@ jobs:
   check-opte-ver:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/[email protected]
+      - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
       - name: Install jq
         run: sudo apt-get install -y jq
       - name: Install toml-cli

.github/workflows/check-workspace-deps.yml

@@ -10,6 +10,6 @@ jobs:
   check-workspace-deps:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/[email protected]
+      - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
       - name: Check Workspace Dependencies
         run: cargo xtask check-workspace-deps

.github/workflows/hakari.yml

@@ -17,21 +17,21 @@ jobs:
     env:
       RUSTFLAGS: -D warnings
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4
+      - uses: actions-rs/toolchain@16499b5e05bf2e26879000db0c1d13f7e13fa3af # v1
         with:
           toolchain: stable
       - name: Install cargo-hakari
-        uses: taiki-e/install-action@v2
+        uses: taiki-e/install-action@e659bf85ee986e37e35cc1c53bfeebe044d8133e # v2
         with:
           tool: cargo-hakari
       - name: Check workspace-hack Cargo.toml is up-to-date
-        uses: actions-rs/cargo@v1
+        uses: actions-rs/cargo@844f36862e911db73fe0815f00a4a2602c279505 # v1
         with:
           command: hakari
           args: generate --diff
       - name: Check all crates depend on workspace-hack
-        uses: actions-rs/cargo@v1
+        uses: actions-rs/cargo@844f36862e911db73fe0815f00a4a2602c279505 # v1
         with:
           command: hakari
           args: manage-deps --dry-run

.github/workflows/rust.yml

@@ -9,7 +9,7 @@ jobs:
   check-style:
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/[email protected]
+    - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
     - name: Report cargo version
       run: cargo --version
     - name: Report rustfmt version
@@ -27,8 +27,8 @@ jobs:
     # This repo is unstable and unnecessary: https://github.com/microsoft/linux-package-repositories/issues/34
     - name: Disable packages.microsoft.com repo
       run: sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
-    - uses: actions/[email protected]
-    - uses: Swatinem/[email protected]
+    - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
+    - uses: Swatinem/rust-cache@6fd3edff6979b79f87531400ad694fb7f2c84b1f # v2.2.1
       if: ${{ github.ref != 'refs/heads/main' }}
     - name: Report cargo version
       run: cargo --version
@@ -53,8 +53,8 @@ jobs:
     # This repo is unstable and unnecessary: https://github.com/microsoft/linux-package-repositories/issues/34
     - name: Disable packages.microsoft.com repo
       run: sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
-    - uses: actions/[email protected]
-    - uses: Swatinem/[email protected]
+    - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
+    - uses: Swatinem/rust-cache@6fd3edff6979b79f87531400ad694fb7f2c84b1f # v2.2.1
       if: ${{ github.ref != 'refs/heads/main' }}
     - name: Report cargo version
       run: cargo --version
@@ -79,8 +79,8 @@ jobs:
     # This repo is unstable and unnecessary: https://github.com/microsoft/linux-package-repositories/issues/34
     - name: Disable packages.microsoft.com repo
       run: sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
-    - uses: actions/[email protected]
-    - uses: Swatinem/[email protected]
+    - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
+    - uses: Swatinem/rust-cache@6fd3edff6979b79f87531400ad694fb7f2c84b1f # v2.2.1
       if: ${{ github.ref != 'refs/heads/main' }}
     - name: Report cargo version
       run: cargo --version

.github/workflows/update-dendrite.yml

@@ -29,7 +29,7 @@ jobs:
     steps:
 
       # Checkout both the target and integration branches
-      - uses: actions/[email protected]
+      - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
         with:
           token: ${{ inputs.reflector_access_token }}
           fetch-depth: 0

.github/workflows/update-maghemite.yml

@@ -29,7 +29,7 @@ jobs:
     steps:
 
       # Checkout both the target and integration branches
-      - uses: actions/[email protected]
+      - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
         with:
           token: ${{ inputs.reflector_access_token }}
           fetch-depth: 0

.github/workflows/validate-openapi-spec.yml

@@ -10,8 +10,8 @@ jobs:
   format:
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/[email protected]
-      - uses: actions/[email protected]
+      - uses: actions/checkout@8f4b7f84864484a7bf31766abe9204da3cbe65b3 # v3.5.0
+      - uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
         with:
           node-version: '18'
       - name: Install our tools

Cargo.toml

@@ -275,7 +275,7 @@ percent-encoding = "2.2.0"
 pem = "1.1"
 petgraph = "0.6.4"
 postgres-protocol = "0.6.6"
-predicates = "3.0.3"
+predicates = "3.0.4"
 pretty_assertions = "1.4.0"
 pretty-hex = "0.3.0"
 proc-macro2 = "1.0"
@@ -284,7 +284,7 @@ progenitor-client = { git = "https://github.com/oxidecomputer/progenitor", branc
 bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "901b710b6e5bd05a94a323693c2b971e7e7b240e" }
 propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "901b710b6e5bd05a94a323693c2b971e7e7b240e", features = [ "generated-migration" ] }
 propolis-server = { git = "https://github.com/oxidecomputer/propolis", rev = "901b710b6e5bd05a94a323693c2b971e7e7b240e", default-features = false, features = ["mock-only"] }
-proptest = "1.2.0"
+proptest = "1.3.1"
 quote = "1.0"
 rand = "0.8.5"
 ratatui = "0.23.0"

tools/destroy_virtual_hardware.sh

@@ -56,7 +56,23 @@ function remove_softnpu_zone {
         --ports sc0_1,tfportqsfp0_0
 }
 
+# Some services have their working data overlaid by backing mounts from the
+# internal boot disk. Before we can destroy the ZFS pools, we need to unmount
+# these.
+
+BACKED_SERVICES="svc:/system/fmd:default"
+
+function demount_backingfs {
+    svcadm disable -st $BACKED_SERVICES
+    zpool list -Hpo name | grep '^oxi_' \
+        | xargs -i zfs list -Hpo name,canmount,mounted -r {}/backing \
+        | awk '$3 == "yes" && $2 == "noauto" { print $1 }' \
+        | xargs -l zfs umount
+    svcadm enable -st $BACKED_SERVICES
+}
+
 verify_omicron_uninstalled
+demount_backingfs
 unload_xde_driver
 remove_softnpu_zone
 try_remove_vnics

workspace-hack/Cargo.toml

@@ -73,7 +73,7 @@ petgraph = { version = "0.6.4", features = ["serde-1"] }
 phf_shared = { version = "0.11.2" }
 postgres-types = { version = "0.2.6", default-features = false, features = ["with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] }
 ppv-lite86 = { version = "0.2.17", default-features = false, features = ["simd", "std"] }
-predicates = { version = "3.0.3" }
+predicates = { version = "3.0.4" }
 rand = { version = "0.8.5", features = ["min_const_gen", "small_rng"] }
 rand_chacha = { version = "0.3.1" }
 regex = { version = "1.9.5" }
@@ -171,7 +171,7 @@ petgraph = { version = "0.6.4", features = ["serde-1"] }
 phf_shared = { version = "0.11.2" }
 postgres-types = { version = "0.2.6", default-features = false, features = ["with-chrono-0_4", "with-serde_json-1", "with-uuid-1"] }
 ppv-lite86 = { version = "0.2.17", default-features = false, features = ["simd", "std"] }
-predicates = { version = "3.0.3" }
+predicates = { version = "3.0.4" }
 rand = { version = "0.8.5", features = ["min_const_gen", "small_rng"] }
 rand_chacha = { version = "0.3.1" }
 regex = { version = "1.9.5" }