Remove explicit storage path

oxidecomputer · Feb 26, 2024 · ef8cb9c · ef8cb9c
1 parent 1976a66
commit ef8cb9c
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 12 deletions.
diff --git a/oximeter/db/src/configs/keeper_config.xml b/oximeter/db/src/configs/keeper_config.xml
@@ -16,7 +16,6 @@
         <tcp_port from_env="CH_LISTEN_PORT"/>
         <server_id from_env="CH_KEEPER_ID_CURRENT"/>
         <log_storage_path from_env="CH_LOG_STORAGE_PATH"/>
-        <storage_path from_env="CH_STORAGE_PATH"/>
         <snapshot_storage_path from_env="CH_SNAPSHOT_STORAGE_PATH"/>
         <coordination_settings>
             <operation_timeout_ms>10000</operation_timeout_ms>

diff --git a/smf/clickhouse_keeper/keeper_config.xml b/smf/clickhouse_keeper/keeper_config.xml
@@ -9,14 +9,13 @@
     </logger>
 
     <!-- To allow all use :: -->
-    <listen_host from_env="CH_LISTEN_ADDR"/> 
+    <listen_host from_env="CH_LISTEN_ADDR"/>
     <path replace="true" from_env="CH_DATASTORE"/>
 
     <keeper_server>
         <tcp_port from_env="CH_LISTEN_PORT"/>
         <server_id from_env="CH_KEEPER_ID_CURRENT"/>
         <log_storage_path from_env="CH_LOG_STORAGE_PATH"/>
-        <storage_path from_env="CH_STORAGE_PATH"/>
         <snapshot_storage_path from_env="CH_SNAPSHOT_STORAGE_PATH"/>
         <coordination_settings>
             <operation_timeout_ms>10000</operation_timeout_ms>

diff --git a/smf/clickhouse_keeper/method_script.sh b/smf/clickhouse_keeper/method_script.sh
@@ -80,7 +80,6 @@ export CH_DATASTORE=${DATASTORE}
 export CH_LISTEN_PORT=${LISTEN_PORT}
 export CH_KEEPER_ID_CURRENT=${KEEPER_ID_CURRENT}
 export CH_LOG_STORAGE_PATH="${DATASTORE}/log"
-export CH_STORAGE_PATH="${DATASTORE}/storage"
 export CH_SNAPSHOT_STORAGE_PATH="${DATASTORE}/snapshots"
 export CH_KEEPER_ID_01=${KEEPER_ID_01}
 export CH_KEEPER_ID_02=${KEEPER_ID_02}
@@ -96,7 +95,6 @@ CH_DATASTORE="${CH_DATASTORE}"\n\
 CH_LISTEN_PORT="${CH_LISTEN_PORT}"\n\
 CH_KEEPER_ID_CURRENT="${CH_KEEPER_ID_CURRENT}"\n\
 CH_LOG_STORAGE_PATH="${CH_LOG_STORAGE_PATH}"\n\
-CH_STORAGE_PATH="${CH_STORAGE_PATH}"\n\
 CH_SNAPSHOT_STORAGE_PATH="${CH_SNAPSHOT_STORAGE_PATH}"\n\
 CH_KEEPER_ID_01="${CH_KEEPER_ID_01}"\n\
 CH_KEEPER_ID_02="${CH_KEEPER_ID_02}"\n\

diff --git a/test-utils/src/dev/clickhouse.rs b/test-utils/src/dev/clickhouse.rs
@@ -239,7 +239,6 @@ impl ClickHouseInstance {
             .env("CH_KEEPER_ID_CURRENT", k_id.to_string())
             .env("CH_DATASTORE", data_dir.datastore_path())
             .env("CH_LOG_STORAGE_PATH", data_dir.keeper_log_storage_path())
-            .env("CH_STORAGE_PATH", data_dir.keeper_storage_path())
             .env(
                 "CH_SNAPSHOT_STORAGE_PATH",
                 data_dir.keeper_snapshot_storage_path(),
@@ -343,8 +342,6 @@ impl ClickHouseDataDir {
             .context("failed to create datastore directory")?;
         std::fs::create_dir(ret.cwd_path())
             .context("failed to create cwd directory")?;
-        std::fs::create_dir(ret.keeper_storage_path())
-            .context("failed to create keeper storagedirectory")?;
         std::fs::create_dir(ret.keeper_log_storage_path())
             .context("failed to create keeper log directory")?;
         std::fs::create_dir(ret.keeper_snapshot_storage_path())
@@ -412,10 +409,6 @@ impl ClickHouseDataDir {
         self.dir.path().join("snapshots/")
     }
 
-    fn keeper_storage_path(&self) -> Utf8PathBuf {
-        self.dir.path().join("storage/")
-    }
-
     fn close_clean(self) -> Result<(), anyhow::Error> {
         self.dir.close().context("failed to delete ClickHouse data dir")
     }