diff --git a/oximeter/db/src/client/mod.rs b/oximeter/db/src/client/mod.rs index 8650dc1c76..364c1ec46c 100644 --- a/oximeter/db/src/client/mod.rs +++ b/oximeter/db/src/client/mod.rs @@ -1001,6 +1001,9 @@ impl Client { }) .await?; + // This size is arbitrary, and just something to avoid enormous requests + // to ClickHouse. It's unlikely that we'll hit this in practice anyway, + // given that we have far fewer than 1000 timeseries today. const DELETE_BATCH_SIZE: usize = 1000; let maybe_on_cluster = if replicated { format!("ON CLUSTER {}", crate::CLUSTER_NAME) @@ -1056,7 +1059,7 @@ impl Client { .map(|line| line.trim().parse().map_err(Error::from)) .collect(), Err(e) if e.kind() == ErrorKind::NotFound => Ok(vec![]), - Err(err) => Err(Error::ReadTimeseriesToDelete { err }), + Err(err) => Err(Error::ReadTimeseriesToDeleteFile { err }), } } diff --git a/oximeter/db/src/lib.rs b/oximeter/db/src/lib.rs index be71c7ecb9..123e4f15d4 100644 --- a/oximeter/db/src/lib.rs +++ b/oximeter/db/src/lib.rs @@ -139,7 +139,7 @@ pub enum Error { NonSequentialSchemaVersions, #[error("Could not read timeseries_to_delete file")] - ReadTimeseriesToDelete { + ReadTimeseriesToDeleteFile { #[source] err: io::Error, },