Skip to content

fix(topology): serialize enrichment table registry loads #25615

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pront merged 1 commit into from
Jun 15, 2026
Merged

fix(topology): serialize enrichment table registry loads #25615

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/topology/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use metrics::Counter;
use stream_cancel::{StreamExt as StreamCancelExt, Trigger, Tripwire};
use tokio::{
select,
sync::{mpsc::UnboundedSender, oneshot},
sync::{Mutex as AsyncMutex, mpsc::UnboundedSender, oneshot},
time::timeout,
};
use tracing::{Instrument, Span};
Expand Down Expand Up @@ -66,6 +66,9 @@ use crate::{

static ENRICHMENT_TABLES: LazyLock<vector_lib::enrichment::TableRegistry> =
LazyLock::new(vector_lib::enrichment::TableRegistry::default);
// `TableRegistry::load` and `finish_load` are separate operations on a process-global registry.
// Keep topology builds and enrichment-table reloads from interleaving that transition.
static ENRICHMENT_TABLES_LOAD_LOCK: LazyLock<AsyncMutex<()>> = LazyLock::new(AsyncMutex::default);
static METRICS_STORAGE: LazyLock<MetricsStorage> = LazyLock::new(MetricsStorage::default);

pub(crate) static SOURCE_SENDER_BUFFER_SIZE: LazyLock<usize> =
Expand Down Expand Up @@ -133,6 +136,7 @@ impl<'a> Builder<'a> {

/// Builds the new pieces of the topology found in `self.diff`.
async fn build(mut self) -> Result<TopologyPieces, Vec<String>> {
let _enrichment_tables_load_guard = ENRICHMENT_TABLES_LOAD_LOCK.lock().await;
let enrichment_tables = self.load_enrichment_tables().await;
let source_tasks = self.build_sources(enrichment_tables).await;
self.build_transforms(enrichment_tables).await;
Expand Down Expand Up @@ -1003,6 +1007,7 @@ async fn run_source_output_pump(
}

pub async fn reload_enrichment_tables(config: &Config) {
let _enrichment_tables_load_guard = ENRICHMENT_TABLES_LOAD_LOCK.lock().await;
let mut enrichment_tables = HashMap::new();
// Build enrichment tables
'tables: for (name, table_outer) in config.enrichment_tables.iter() {
Expand Down
Loading