[reconfigurator] Reject clickhouse configurations from old generations

clickhouse-admin/Cargo.toml

@@ -12,6 +12,7 @@ clap.workspace = true
 clickhouse-admin-api.workspace = true
 clickhouse-admin-types.workspace = true
 dropshot.workspace = true
+flume = {workspace = true, features = ["async"]}
 http.workspace = true
 illumos-utils.workspace = true
 omicron-common.workspace = true

clickhouse-admin/api/src/lib.rs

@@ -3,15 +3,16 @@
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 use clickhouse_admin_types::{
-    ClickhouseKeeperClusterMembership, DistributedDdlQueue, KeeperConf,
-    KeeperConfig, KeeperConfigurableSettings, Lgif, MetricInfoPath, RaftConfig,
-    ReplicaConfig, ServerConfigurableSettings, SystemTimeSeries,
+    ClickhouseKeeperClusterMembership, DistributedDdlQueue,
+    GenerateConfigResult, KeeperConf, KeeperConfigurableSettings, Lgif,
+    MetricInfoPath, RaftConfig, ServerConfigurableSettings, SystemTimeSeries,
     TimeSeriesSettingsQuery,
 };
 use dropshot::{
     HttpError, HttpResponseCreated, HttpResponseOk,
     HttpResponseUpdatedNoContent, Path, Query, RequestContext, TypedBody,
 };
+use omicron_common::api::external::Generation;
 
 /// API interface for our clickhouse-admin-keeper server
 ///
@@ -40,7 +41,16 @@ pub trait ClickhouseAdminKeeperApi {
     async fn generate_config_and_enable_svc(
         rqctx: RequestContext<Self::Context>,
         body: TypedBody<KeeperConfigurableSettings>,
-    ) -> Result<HttpResponseCreated<KeeperConfig>, HttpError>;
+    ) -> Result<HttpResponseCreated<GenerateConfigResult>, HttpError>;
+
+    /// Retrieve the generation number of a configuration
+    #[endpoint {
+        method = GET,
+        path = "/generation",
+    }]
+    async fn generation(
+        rqctx: RequestContext<Self::Context>,
+    ) -> Result<HttpResponseOk<Generation>, HttpError>;
 
     /// Retrieve a logically grouped information file from a keeper node.
     /// This information is used internally by ZooKeeper to manage snapshots
@@ -106,7 +116,16 @@ pub trait ClickhouseAdminServerApi {
     async fn generate_config_and_enable_svc(
         rqctx: RequestContext<Self::Context>,
         body: TypedBody<ServerConfigurableSettings>,
-    ) -> Result<HttpResponseCreated<ReplicaConfig>, HttpError>;
+    ) -> Result<HttpResponseCreated<GenerateConfigResult>, HttpError>;
+
+    /// Retrieve the generation number of a configuration
+    #[endpoint {
+        method = GET,
+        path = "/generation",
+    }]
+    async fn generation(
+        rqctx: RequestContext<Self::Context>,
+    ) -> Result<HttpResponseOk<Generation>, HttpError>;
 
     /// Contains information about distributed ddl queries (ON CLUSTER clause)
     /// that were executed on a cluster.

clickhouse-admin/src/clickhouse_cli.rs

@@ -93,8 +93,9 @@ impl ClickhouseCli {
     pub fn new(
         binary_path: Utf8PathBuf,
         listen_address: SocketAddrV6,
-        log: Logger,
+        log: &Logger,
     ) -> Self {
+        let log = log.new(slog::o!("component" => "ClickhouseCli"));
         Self { binary_path, listen_address, log }
     }
 

clickhouse-admin/src/clickward.rs

@@ -3,7 +3,8 @@
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 use clickhouse_admin_types::{
-    KeeperConfig, KeeperSettings, ReplicaConfig, ServerSettings,
+    KeeperConfig, KeeperConfigurableSettings, ReplicaConfig,
+    ServerConfigurableSettings,
 };
 use dropshot::HttpError;
 use slog_error_chain::{InlineErrorChain, SlogInlineError};
@@ -33,7 +34,7 @@ impl From<ClickwardError> for HttpError {
     }
 }
 
-#[derive(Debug)]
+#[derive(Debug, Clone, Copy)]
 pub struct Clickward {}
 
 impl Clickward {
@@ -43,7 +44,7 @@ impl Clickward {
 
     pub fn generate_server_config(
         &self,
-        settings: ServerSettings,
+        settings: &ServerConfigurableSettings,
     ) -> Result<ReplicaConfig, ClickwardError> {
         let replica_config = settings
             .generate_xml_file()
@@ -54,7 +55,7 @@ impl Clickward {
 
     pub fn generate_keeper_config(
         &self,
-        settings: KeeperSettings,
+        settings: &KeeperConfigurableSettings,
     ) -> Result<KeeperConfig, ClickwardError> {
         let keeper_config = settings
             .generate_xml_file()