clean up

internal-dns-cli/src/bin/dnswait.rs

@@ -47,7 +47,9 @@ impl From<ServiceName> for internal_dns::ServiceName {
         match value {
             ServiceName::Cockroach => internal_dns::ServiceName::Cockroach,
             ServiceName::Clickhouse => internal_dns::ServiceName::Clickhouse,
-            ServiceName::ClickhouseServer => internal_dns::ServiceName::ClickhouseServer,
+            ServiceName::ClickhouseServer => {
+                internal_dns::ServiceName::ClickhouseServer
+            }
             ServiceName::ClickhouseKeeper => {
                 internal_dns::ServiceName::ClickhouseKeeper
             }

oximeter/collector/src/bin/oximeter.rs

@@ -142,7 +142,14 @@ async fn do_run() -> Result<(), CmdError> {
                 .context("Failed to create oximeter")
                 .map_err(CmdError::Failure)
         }
-        Args::Standalone { id, address, nexus, clickhouse, log_level, replicated } => {
+        Args::Standalone {
+            id,
+            address,
+            nexus,
+            clickhouse,
+            log_level,
+            replicated,
+        } => {
             // Start the standalone Nexus server, for registration of both the
             // collector and producers.
             let nexus_server = StandaloneNexus::new(nexus.into(), log_level)

package-manifest.toml

@@ -172,7 +172,6 @@ source.paths = [
   { from = "out/clickhouse", to = "/opt/oxide/clickhouse" },
   { from = "smf/clickhouse/manifest.xml", to = "/var/svc/manifest/site/clickhouse/manifest.xml" },
   { from = "smf/clickhouse/method_script.sh", to = "/opt/oxide/lib/svc/manifest/clickhouse.sh" },
-  { from = "smf/clickhouse/config_replica.xml", to = "/opt/oxide/clickhouse/config.d/config_replica.xml" },
 ]
 output.type = "zone"
 output.intermediate_only = true

sled-agent/src/services.rs

@@ -1647,10 +1647,11 @@ impl ServiceManager {
                     .add_property("listen_port", "astring", listen_port)
                     .add_property("store", "astring", "/data");
                 let clickhouse_server_service =
-                    ServiceBuilder::new("oxide/clickhouse_server").add_instance(
-                        ServiceInstanceBuilder::new("default")
-                            .add_property_group(config),
-                    );
+                    ServiceBuilder::new("oxide/clickhouse_server")
+                        .add_instance(
+                            ServiceInstanceBuilder::new("default")
+                                .add_property_group(config),
+                        );
 
                 let ch_address =
                     SocketAddr::new(IpAddr::V6(listen_addr), CLICKHOUSE_PORT)
@@ -1687,7 +1688,10 @@ impl ServiceManager {
                     .add_to_zone(&self.inner.log, &installed_zone)
                     .await
                     .map_err(|err| {
-                        Error::io("Failed to setup clickhouse server profile", err)
+                        Error::io(
+                            "Failed to setup clickhouse server profile",
+                            err,
+                        )
                     })?;
                 RunningZone::boot(installed_zone).await?
             }