diff --git a/oximeter/db/src/configs/keeper_config.xml b/oximeter/db/src/configs/keeper_config.xml index d908745485..ae9d2a9cc5 100644 --- a/oximeter/db/src/configs/keeper_config.xml +++ b/oximeter/db/src/configs/keeper_config.xml @@ -16,7 +16,6 @@ - 10000 diff --git a/smf/clickhouse_keeper/keeper_config.xml b/smf/clickhouse_keeper/keeper_config.xml index 5ee25b0a0d..2d64c2c0a0 100644 --- a/smf/clickhouse_keeper/keeper_config.xml +++ b/smf/clickhouse_keeper/keeper_config.xml @@ -9,14 +9,13 @@ - + - 10000 diff --git a/smf/clickhouse_keeper/method_script.sh b/smf/clickhouse_keeper/method_script.sh index 871ae875ae..a017409a98 100755 --- 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 index 4ff4623765..13ef5480ed 100644 --- 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") }