From a93216a98ccbc68439013320efe79492f7889eab Mon Sep 17 00:00:00 2001 From: Paul Masurel Date: Tue, 31 Oct 2023 09:40:32 +0900 Subject: [PATCH] renamed cpu thousandth to cpu_millis. (#4053) --- quickwit/quickwit-cluster/src/cluster.rs | 2 +- quickwit/quickwit-indexing/src/actors/indexer.rs | 4 ++-- quickwit/quickwit-proto/src/indexing/mod.rs | 8 ++------ 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/quickwit/quickwit-cluster/src/cluster.rs b/quickwit/quickwit-cluster/src/cluster.rs index 8abe200c64b..53a6c0dbbd5 100644 --- a/quickwit/quickwit-cluster/src/cluster.rs +++ b/quickwit/quickwit-cluster/src/cluster.rs @@ -304,7 +304,7 @@ impl Cluster { /// This exposes in chitchat some metrics about the CPU usage of cooperative pipelines. /// The metrics are exposed as follows: /// Key: pipeline_metrics:: - /// Value: 179‰,76MB/s + /// Value: 179m,76MB/s pub async fn update_self_node_pipeline_metrics( &self, pipeline_metrics: &HashMap<&IndexingPipelineId, PipelineMetrics>, diff --git a/quickwit/quickwit-indexing/src/actors/indexer.rs b/quickwit/quickwit-indexing/src/actors/indexer.rs index 85bc7907428..83aa1ca152c 100644 --- a/quickwit/quickwit-indexing/src/actors/indexer.rs +++ b/quickwit/quickwit-indexing/src/actors/indexer.rs @@ -547,13 +547,13 @@ impl Indexer { fn update_pipeline_metrics(&mut self, elapsed: Duration, uncompressed_num_bytes: u64) { let commit_timeout = self.indexer_state.indexing_settings.commit_timeout(); - let cpu_thousandth: u16 = if elapsed >= commit_timeout { + let cpu_millis: u16 = if elapsed >= commit_timeout { 1_000 } else { (elapsed.as_micros() * 1_000 / commit_timeout.as_micros()) as u16 }; self.counters.pipeline_metrics_opt = Some(PipelineMetrics { - cpu_thousandth, + cpu_millis, throughput_mb_per_sec: (uncompressed_num_bytes / (elapsed.as_millis() as u64 * 1_000)) as u16, }); diff --git a/quickwit/quickwit-proto/src/indexing/mod.rs b/quickwit/quickwit-proto/src/indexing/mod.rs index e7c7b3273a3..4d380315f53 100644 --- a/quickwit/quickwit-proto/src/indexing/mod.rs +++ b/quickwit/quickwit-proto/src/indexing/mod.rs @@ -209,17 +209,13 @@ impl TryFrom<&str> for IndexingTask { #[derive(Clone, Copy, Debug, PartialEq, Eq, Serialize, utoipa::ToSchema)] pub struct PipelineMetrics { - pub cpu_thousandth: u16, + pub cpu_millis: u16, pub throughput_mb_per_sec: u16, } impl fmt::Display for PipelineMetrics { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!( - f, - "{}‰,{}MB/s", - self.cpu_thousandth, self.throughput_mb_per_sec - ) + write!(f, "{}m,{}MB/s", self.cpu_millis, self.throughput_mb_per_sec) } }