Fix tests

Author: smklein

openapi/sled-agent.json

@@ -1745,7 +1745,7 @@
         "pattern": "^(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$"
       },
       "ServiceEnsureBody": {
-        "description": "Used to request that the Sled initialize certain services.\n\nThis may be used to record that certain sleds are responsible for launching services which may not be associated with a dataset, such as Nexus.",
+        "description": "Used to request that the Sled initialize multiple services.\n\nThis may be used to record that certain sleds are responsible for launching services which may not be associated with a dataset, such as Nexus.",
         "type": "object",
         "properties": {
           "services": {
@@ -2138,6 +2138,7 @@
         ]
       },
       "ServiceZoneService": {
+        "description": "Used to request that the Sled initialize a single service.",
         "type": "object",
         "properties": {
           "details": {

sled-agent/src/params.rs

@@ -575,7 +575,7 @@ impl From<ServiceZoneRequest> for sled_agent_client::types::ServiceZoneRequest {
     }
 }
 
-/// Used to request that the Sled initialize certain services.
+/// Used to request that the Sled initialize a single service.
 #[derive(
     Clone, Debug, Deserialize, Serialize, JsonSchema, PartialEq, Eq, Hash,
 )]
@@ -590,7 +590,7 @@ impl From<ServiceZoneService> for sled_agent_client::types::ServiceZoneService {
     }
 }
 
-/// Used to request that the Sled initialize certain services on initialization.
+/// Used to request that the Sled initialize multiple services.
 ///
 /// This may be used to record that certain sleds are responsible for
 /// launching services which may not be associated with a dataset, such

sled-agent/src/services.rs

@@ -464,9 +464,11 @@ impl ServiceManager {
 
     pub async fn load_non_storage_services(&self) -> Result<(), Error> {
         let log = &self.inner.log;
-        let services =
-            AllZoneRequests::read_from(log, &self.services_ledger_path()?)
-                .await?;
+        let ledger = self.services_ledger_path()?;
+        if !ledger.exists() {
+            return Ok(());
+        }
+        let services = AllZoneRequests::read_from(log, &ledger).await?;
         let mut existing_zones = self.inner.zones.lock().await;
 
         // Initialize and DNS and NTP services first as they are required
@@ -535,11 +537,11 @@ impl ServiceManager {
 
     pub async fn load_storage_services(&self) -> Result<(), Error> {
         let log = &self.inner.log;
-        let services = AllZoneRequests::read_from(
-            log,
-            &self.storage_services_ledger_path()?,
-        )
-        .await?;
+        let ledger = self.storage_services_ledger_path()?;
+        if !ledger.exists() {
+            return Ok(());
+        }
+        let services = AllZoneRequests::read_from(log, &ledger).await?;
         let mut existing_zones = self.inner.dataset_zones.lock().await;
         self.initialize_services_locked(
             &mut existing_zones,
@@ -558,6 +560,7 @@ impl ServiceManager {
         underlay_address: Ipv6Addr,
         rack_id: Uuid,
     ) -> Result<(), Error> {
+        debug!(&self.inner.log, "sled agent started"; "underlay_address" => underlay_address.to_string());
         self.inner
             .sled_info
             .set(SledAgentInfo {