From debf68734bc5c9f9ed4e6258f25e7b8aa22ae954 Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Thu, 20 Mar 2025 09:54:49 +0100 Subject: [PATCH] fix: improve memory metrics graph --- .../20250320081915_longer_variable_description.down.sql | 1 + .../20250320081915_longer_variable_description.up.sql | 3 +++ backend/windmill-common/src/job_metrics.rs | 5 +---- backend/windmill-worker/src/bash_executor.rs | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 backend/migrations/20250320081915_longer_variable_description.down.sql create mode 100644 backend/migrations/20250320081915_longer_variable_description.up.sql diff --git a/backend/migrations/20250320081915_longer_variable_description.down.sql b/backend/migrations/20250320081915_longer_variable_description.down.sql new file mode 100644 index 0000000000..d2f607c5b8 --- /dev/null +++ b/backend/migrations/20250320081915_longer_variable_description.down.sql @@ -0,0 +1 @@ +-- Add down migration script here diff --git a/backend/migrations/20250320081915_longer_variable_description.up.sql b/backend/migrations/20250320081915_longer_variable_description.up.sql new file mode 100644 index 0000000000..d7c5ba06f5 --- /dev/null +++ b/backend/migrations/20250320081915_longer_variable_description.up.sql @@ -0,0 +1,3 @@ +-- Add up migration script here +ALTER TABLE variable +ALTER COLUMN description TYPE VARCHAR(10000); \ No newline at end of file diff --git a/backend/windmill-common/src/job_metrics.rs b/backend/windmill-common/src/job_metrics.rs index 6577e34d6e..d416e4d44b 100644 --- a/backend/windmill-common/src/job_metrics.rs +++ b/backend/windmill-common/src/job_metrics.rs @@ -49,10 +49,7 @@ pub async fn register_metric_for_job( .await? .flatten(); if exists.unwrap_or(false) { - return Err(error::Error::BadRequest(format!( - "Metric {} is already registered for job {}", - metric_id, job_id - ))); + return Ok(metric_id); } let (scalar_int, scalar_float, timestamps, timeseries_int, timeseries_float) = match metric_kind diff --git a/backend/windmill-worker/src/bash_executor.rs b/backend/windmill-worker/src/bash_executor.rs index 86f472705c..412014eb73 100644 --- a/backend/windmill-worker/src/bash_executor.rs +++ b/backend/windmill-worker/src/bash_executor.rs @@ -341,7 +341,7 @@ async fn handle_docker_job( tracing::error!("Error getting logs: {:?}", e); } _ => { - tracing::error!("End of stream"); + tracing::info!("End of docker logs stream"); return } };