From e6ea02b04896f97897675fb98a76b8ec34925fc0 Mon Sep 17 00:00:00 2001
From: David Pacheco <dap@oxidecomputer.com>
Date: Thu, 30 Nov 2023 12:43:24 -0800
Subject: [PATCH 1/3] post-4466 cleanup

---
 common/src/ledger.rs       | 4 ++--
 sled-agent/src/services.rs | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/common/src/ledger.rs b/common/src/ledger.rs
index c120ab953c..7bbc09d5db 100644
--- a/common/src/ledger.rs
+++ b/common/src/ledger.rs
@@ -7,7 +7,7 @@
 use async_trait::async_trait;
 use camino::{Utf8Path, Utf8PathBuf};
 use serde::{de::DeserializeOwned, Serialize};
-use slog::{error, info, warn, Logger};
+use slog::{debug, info, warn, Logger};
 
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
@@ -88,7 +88,7 @@ impl<T: Ledgerable> Ledger<T> {
             match T::read_from(log, &path).await {
                 Ok(ledger) => ledgers.push(ledger),
                 Err(err) => {
-                    error!(log, "Failed to read ledger: {err}"; "path" => %path)
+                    debug!(log, "Failed to read ledger: {err}"; "path" => %path)
                 }
             }
         }
diff --git a/sled-agent/src/services.rs b/sled-agent/src/services.rs
index 88f79e7064..1bbc22777a 100644
--- a/sled-agent/src/services.rs
+++ b/sled-agent/src/services.rs
@@ -850,8 +850,6 @@ impl ServiceManager {
                     matches!(
                         z.zone_type,
                         OmicronZoneType::InternalDns { .. }
-                            | OmicronZoneType::BoundaryNtp { .. }
-                            | OmicronZoneType::InternalNtp { .. }
                     )
                 },
             )
@@ -861,8 +859,6 @@ impl ServiceManager {
         // synchronization, which is a pre-requisite for the other services. We
         // keep `OmicronZoneType::InternalDns` because
         // `ensure_all_omicron_zones` is additive.
-        // TODO This looks like a duplicate of the block above -- why do we do
-        // this?
         let all_zones_request = self
             .ensure_all_omicron_zones(
                 &mut existing_zones,

From 3400e47cdb9f8632745b8bdfb24c49900eb22352 Mon Sep 17 00:00:00 2001
From: David Pacheco <dap@oxidecomputer.com>
Date: Thu, 30 Nov 2023 13:44:51 -0800
Subject: [PATCH 2/3] fix style

---
 sled-agent/src/services.rs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/sled-agent/src/services.rs b/sled-agent/src/services.rs
index 1bbc22777a..8e75940e5a 100644
--- a/sled-agent/src/services.rs
+++ b/sled-agent/src/services.rs
@@ -847,10 +847,7 @@ impl ServiceManager {
                 None,
                 omicron_zones_config.clone(),
                 |z: &OmicronZoneConfig| {
-                    matches!(
-                        z.zone_type,
-                        OmicronZoneType::InternalDns { .. }
-                    )
+                    matches!(z.zone_type, OmicronZoneType::InternalDns { .. })
                 },
             )
             .await?;

From 40e77a4c4fca252cd3615851f1326a81cf37af14 Mon Sep 17 00:00:00 2001
From: David Pacheco <dap@oxidecomputer.com>
Date: Wed, 6 Dec 2023 20:27:05 -0800
Subject: [PATCH 3/3] another warn -> info

---
 common/src/ledger.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/src/ledger.rs b/common/src/ledger.rs
index 7bbc09d5db..71d03fa8ee 100644
--- a/common/src/ledger.rs
+++ b/common/src/ledger.rs
@@ -184,7 +184,7 @@ pub trait Ledgerable: DeserializeOwned + Serialize + Send + Sync {
                 err,
             })
         } else {
-            warn!(log, "No ledger in {path}");
+            info!(log, "No ledger in {path}");
             Err(Error::NotFound)
         }
     }