svc autoclear behind compilation flag, bump dendrite

illumos-utils/src/svc.rs

@@ -11,11 +11,8 @@ use omicron_common::backoff;
 
 #[cfg_attr(any(test, feature = "testing"), mockall::automock, allow(dead_code))]
 mod inner {
-    use slog::{warn, Logger};
-
-    use crate::PFEXEC;
-
     use super::*;
+    use slog::{warn, Logger};
 
     // TODO(https://www.illumos.org/issues/13837): This is a hack;
     // remove me when when fixed. Ideally, the ".synchronous()" argument
@@ -61,9 +58,13 @@ mod inner {
                     {
                         return Ok(());
                     } else {
+                        // This is helpful in virtual environments where
+                        // services take a few tries to come up. To enable,
+                        // compile with RUSTFLAGS="--cfg svcadm_autoclear"
+                        #[cfg(svcadm_autoclear)]
                         if let Some(zname) = zone {
                             if let Err(out) =
-                                tokio::process::Command::new(PFEXEC)
+                                tokio::process::Command::new(crate::PFEXEC)
                                     .env_clear()
                                     .arg("svcadm")
                                     .arg("-z")

package-manifest.toml

@@ -473,8 +473,8 @@ only_for_targets.image = "standard"
 # 2. Copy dendrite.tar.gz from dendrite/out to omicron/out
 source.type = "prebuilt"
 source.repo = "dendrite"
-source.commit = "5632a2faabedc2941b05797a84528915d6af6ef3"
-source.sha256 = "f1fc8a84b0eb2432a4d424821a33826eebd546b23a793d6a54cad9a7e1933bff"
+source.commit = "4dde713fb58a0342622c4619ecfd0d6eafa421d6"
+source.sha256 = "843f53b6a41b08abefa0c8fdac4ab75088c7e2ee816a9d827ebf9b84fc955947"
 output.type = "zone"
 output.intermediate_only = true
 
@@ -498,8 +498,8 @@ only_for_targets.image = "standard"
 # 2. Copy the output zone image from dendrite/out to omicron/out
 source.type = "prebuilt"
 source.repo = "dendrite"
-source.commit = "5632a2faabedc2941b05797a84528915d6af6ef3"
-source.sha256 = "6983438f6702911c85708f8aff1a3bc3ae4878e56151ce63a338a7f81f4ae1e5"
+source.commit = "4dde713fb58a0342622c4619ecfd0d6eafa421d6"
+source.sha256 = "77f77ec95d26d0b8e26e790be81c77b414378a35da77d4e46874a9b7ca55001e"
 output.type = "zone"
 output.intermediate_only = true
 
@@ -516,8 +516,8 @@ only_for_targets.image = "standard"
 # 2. Copy dendrite.tar.gz from dendrite/out to omicron/out/dendrite-softnpu.tar.gz
 source.type = "prebuilt"
 source.repo = "dendrite"
-source.commit = "5632a2faabedc2941b05797a84528915d6af6ef3"
-source.sha256 = "e77d424dd5c13834086d3d5875fa9eaccfc0e57ff8b5178b701a6b4000ae8fcb"
+source.commit = "4dde713fb58a0342622c4619ecfd0d6eafa421d6"
+source.sha256 = "467be11b2ceab363d02c9b657c60cae2b7c5e42837f75beb1e615fe4d189dc09"
 output.type = "zone"
 output.intermediate_only = true
 

tools/dendrite_openapi_version

@@ -1,2 +1,2 @@
-COMMIT="5632a2faabedc2941b05797a84528915d6af6ef3"
+COMMIT="4dde713fb58a0342622c4619ecfd0d6eafa421d6"
 SHA2="544ab42ccc7942d8ece9cdc80cd85d002bcf9d5646a291322bf2f79087ab6df0"

tools/dendrite_stub_checksums

@@ -1,3 +1,3 @@
-CIDL_SHA256_ILLUMOS="f1fc8a84b0eb2432a4d424821a33826eebd546b23a793d6a54cad9a7e1933bff"
-CIDL_SHA256_LINUX_DPD="7461b5facc3869ff4dbd81c8d7302d5b350a9609d5a5b49735612ebaa8fbdc63"
+CIDL_SHA256_ILLUMOS="843f53b6a41b08abefa0c8fdac4ab75088c7e2ee816a9d827ebf9b84fc955947"
+CIDL_SHA256_LINUX_DPD="bab6f1ed0598ed827299e0700aed61e11c2350d23220829948b9a76835a0c04f"
 CIDL_SHA256_LINUX_SWADM="645faf8a93bcae9814b2f116bccd66a54763332b56220e93b66316c853ce13d2"