From f5ef18d28ddfec0656faeae661487a07b4307a74 Mon Sep 17 00:00:00 2001 From: Jackson Newhouse Date: Fri, 10 Jan 2025 23:25:44 -0800 Subject: [PATCH] bump to 60 minutes for docker build. --- .circleci/config.yml | 4 ++-- influxdb3_processing_engine/src/lib.rs | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 88758dc992..df7a5dae8d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -290,7 +290,7 @@ jobs: name: Cargo release build command: target-env cargo build --target=<< parameters.target >> --profile=<< parameters.profile >> --workspace # linking might take a while and doesn't produce CLI output - no_output_timeout: 30m + no_output_timeout: 60m - run: name: tar and gzip build artifacts command: | @@ -473,7 +473,7 @@ jobs: "influxdb3" \ "aws,gcp,azure,jemalloc_replacing_malloc,tokio_console,system-py" \ "influxdb3-edge-arm64:latest" - no_output_timeout: 30m + no_output_timeout: 60m - run: | docker save influxdb3-edge-arm64:latest >influxdb3-edge-arm64.tar - persist_to_workspace: diff --git a/influxdb3_processing_engine/src/lib.rs b/influxdb3_processing_engine/src/lib.rs index 606e985e53..2a0f559fc7 100644 --- a/influxdb3_processing_engine/src/lib.rs +++ b/influxdb3_processing_engine/src/lib.rs @@ -15,7 +15,7 @@ use influxdb3_wal::{ }; use influxdb3_write::WriteBuffer; use iox_time::TimeProvider; -use observability_deps::tracing::warn; +use observability_deps::tracing::{info, warn}; use std::any::Any; use std::sync::Arc; use tokio::sync::oneshot::Receiver; @@ -51,6 +51,7 @@ impl PluginChannels { if let Some(trigger_map) = self.active_triggers.get_mut(&db) { if let Some(sender) = trigger_map.remove(&trigger) { if sender.send(PluginEvent::Shutdown(tx)).await.is_ok() { + info!("waiting for shutdown response"); rx.await.ok(); } } @@ -328,7 +329,9 @@ impl ProcessingEngineManager for ProcessingEngineManagerImpl { self.wal.write_ops(vec![wal_op]).await?; } + info!("taking lock on plugin_event_tx for shutdown"); let mut plugin_channels = self.plugin_event_tx.lock().await; + info!("got lock on plugin_event_tx for shutdown"); plugin_channels .shutdown(db_name.to_string(), trigger_name.to_string()) .await; @@ -412,7 +415,9 @@ impl ProcessingEngineManager for ProcessingEngineManagerImpl { #[async_trait::async_trait] impl WalFileNotifier for ProcessingEngineManagerImpl { async fn notify(&self, write: Arc) { + info!("taking plugin_event_tx lock for notify"); let plugin_channels = self.plugin_event_tx.lock().await; + info!("got lock on plugin_event_tx"); plugin_channels.send_wal_contents(write).await; }