From e6ea02b04896f97897675fb98a76b8ec34925fc0 Mon Sep 17 00:00:00 2001 From: David Pacheco Date: Thu, 30 Nov 2023 12:43:24 -0800 Subject: [PATCH] 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 Ledger { 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,