Fix merge conflict regarding clickhouse-admin (#6834)

oxidecomputer · Oct 11, 2024 · 4e8200a · 4e8200a
1 parent d0c79b6
commit 4e8200a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/nexus/reconfigurator/execution/src/clickhouse.rs b/nexus/reconfigurator/execution/src/clickhouse.rs
@@ -92,8 +92,11 @@ pub(crate) async fn deploy_nodes(
         let log = log.new(slog::o!("admin_url" => admin_url.clone()));
         futs.push(Either::Left(async move {
             let client = Client::new(&admin_url, log.clone());
-            client.generate_keeper_config(&config).await.map(|_| ()).map_err(
-                |e| {
+            client
+                .generate_keeper_config_and_enable(&config)
+                .await
+                .map(|_| ())
+                .map_err(|e| {
                     anyhow!(
                         concat!(
                             "failed to send config for clickhouse keeper ",
@@ -104,8 +107,7 @@ pub(crate) async fn deploy_nodes(
                         admin_url,
                         e
                     )
-                },
-            )
+                })
         }));
     }
     for config in server_configs {
@@ -119,8 +121,11 @@ pub(crate) async fn deploy_nodes(
         let log = opctx.log.new(slog::o!("admin_url" => admin_url.clone()));
         futs.push(Either::Right(async move {
             let client = Client::new(&admin_url, log.clone());
-            client.generate_server_config(&config).await.map(|_| ()).map_err(
-                |e| {
+            client
+                .generate_server_config_and_enable(&config)
+                .await
+                .map(|_| ())
+                .map_err(|e| {
                     anyhow!(
                         concat!(
                             "failed to send config for clickhouse server ",
@@ -131,8 +136,7 @@ pub(crate) async fn deploy_nodes(
                         admin_url,
                         e
                     )
-                },
-            )
+                })
         }));
     }