"tests/entrypoints/openai/completion/test_completion.py" did not exist on "c5b8b5953a2e20e8358d0828aad11d259c073c50"
subscriber.rs 29.9 KB
Newer Older
1
// SPDX-FileCopyrightText: Copyright (c) 2024-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
2
3
// SPDX-License-Identifier: Apache-2.0

4
use std::{collections::HashMap, collections::HashSet, time::Duration};
5
6
7
8

use anyhow::Result;
use dynamo_runtime::{
    component::Component,
9
    config::environment_names::nats as env_nats,
10
    discovery::{DiscoveryEvent, DiscoveryQuery, EventTransportKind},
11
    prelude::*,
12
    transports::event_plane::EventSubscriber,
13
    transports::nats::{NatsQueue, Slug},
14
};
15
use futures::StreamExt;
16
use rand::Rng;
17
18
19
use tokio::sync::{mpsc, oneshot};
use tokio_util::sync::CancellationToken;

20
21
use crate::kv_router::{
    KV_EVENT_SUBJECT, RADIX_STATE_BUCKET, RADIX_STATE_FILE,
22
23
    indexer::{DumpRequest, GetWorkersRequest},
    protocols::{DpRank, RouterEvent, WorkerId},
24
    router_discovery_query,
25
    worker_query::WorkerQueryClient,
26
27
};

28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
/// Helper function to create a KV stream name from a component and subject.
///
/// Generates a slugified stream name in the format:
/// `namespace-{namespace}-component-{component}-{subject}`
fn create_kv_stream_name(component: &Component, subject: &str) -> String {
    Slug::slugify(&format!(
        "namespace.{}.component.{}.{}",
        component.namespace().name(),
        component.name(),
        subject
    ))
    .to_string()
    .replace("_", "-")
}

43
44
45
46
47
48
49
/// Delay between snapshot reads to verify stability
const SNAPSHOT_STABILITY_DELAY: Duration = Duration::from_millis(100);
const MAX_SNAPSHOT_STABILITY_ATTEMPTS: usize = 10;

const CHECK_INTERVAL_BASE: Duration = Duration::from_secs(1);
const CHECK_INTERVAL_JITTER_MS: i64 = 100;

50
51
52
53
// ============================================================================
// Discovery Helpers
// ============================================================================

54
55
56
/// Get the instance discovery stream for monitoring worker add/remove events.
/// Waits for at least one instance to be discovered before returning.
async fn get_instance_discovery_stream(
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
    component: &Component,
    cancellation_token: &CancellationToken,
) -> Result<std::pin::Pin<Box<dyn futures::Stream<Item = Result<DiscoveryEvent>> + Send>>> {
    let discovery_client = component.drt().discovery();
    let generate_discovery_key = DiscoveryQuery::Endpoint {
        namespace: component.namespace().name().to_string(),
        component: component.name().to_string(),
        endpoint: "generate".to_string(),
    };

    let mut stream = discovery_client
        .list_and_watch(generate_discovery_key, Some(cancellation_token.clone()))
        .await?
        .peekable();

    tracing::info!("KV subscriber waiting for at least one worker instance...");
    std::pin::Pin::new(&mut stream).peek().await;

    Ok(Box::pin(stream))
}

78
79
80
81
// ============================================================================
// Snapshot Management
// ============================================================================

82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
/// Download a stable snapshot from object store and send events to the indexer.
/// Retries until two consecutive reads match or max attempts is reached.
async fn download_stable_snapshot(
    nats_client: &dynamo_runtime::transports::nats::Client,
    bucket_name: &str,
    kv_events_tx: &mpsc::Sender<RouterEvent>,
) -> Result<()> {
    let url = url::Url::parse(&format!(
        "nats://{}/{bucket_name}/{RADIX_STATE_FILE}",
        nats_client.addr()
    ))?;

    // Try to get initial snapshot
    let Ok(mut prev_events) = nats_client
        .object_store_download_data::<Vec<RouterEvent>>(&url)
        .await
    else {
        tracing::debug!(
            "Failed to download snapshots. This is normal for freshly started Router replicas."
        );
        return Ok(());
    };

    // Keep trying until we get two consecutive stable reads
    for attempt in 1..=MAX_SNAPSHOT_STABILITY_ATTEMPTS {
        tokio::time::sleep(SNAPSHOT_STABILITY_DELAY).await;

        let curr_events = match nats_client
            .object_store_download_data::<Vec<RouterEvent>>(&url)
            .await
        {
            Ok(events) => events,
            Err(e) => {
                tracing::warn!(
                    "Snapshot read failed on attempt {attempt}, using previous snapshot with {} events: {e:?}",
                    prev_events.len()
                );
                break;
            }
        };

        // Check if snapshot is stable (two consecutive reads match)
        if prev_events == curr_events {
            tracing::info!(
                "Successfully downloaded stable snapshot with {} events from object store (stable after {attempt} attempts)",
                curr_events.len()
            );
            prev_events = curr_events;
            break;
        }

        tracing::debug!(
            "Snapshot changed between reads on attempt {attempt} ({} -> {} events), retrying",
            prev_events.len(),
            curr_events.len()
        );
        prev_events = curr_events;

        if attempt == MAX_SNAPSHOT_STABILITY_ATTEMPTS {
            tracing::warn!(
                "Max stability attempts reached, using latest snapshot with {} events",
                prev_events.len()
            );
        }
    }

    // Send all events to the indexer
    for event in prev_events {
        if let Err(e) = kv_events_tx.send(event).await {
            tracing::warn!("Failed to send initial event to indexer: {e:?}");
        }
    }
    tracing::info!("Successfully sent all initial events to indexer");

    Ok(())
}

159
160
161
162
163
/// Resources required for snapshot operations
#[derive(Clone)]
struct SnapshotResources {
    nats_client: dynamo_runtime::transports::nats::Client,
    bucket_name: String,
164
165
166
    instances_rx: tokio::sync::watch::Receiver<Vec<dynamo_runtime::component::Instance>>,
    get_workers_tx: mpsc::Sender<GetWorkersRequest>,
    snapshot_tx: mpsc::Sender<DumpRequest>,
167
168
169
}

impl SnapshotResources {
170
    /// Perform snapshot upload and purge operations
171
172
173
174
175
176
177
178
179
180
181
182
183
184
    async fn purge_then_snapshot(
        &self,
        nats_queue: &mut NatsQueue,
        remove_worker_tx: &mpsc::Sender<WorkerId>,
    ) -> anyhow::Result<()> {
        // Purge before snapshot ensures new/warm-restarted routers won't replay already-acknowledged messages.
        // Since KV events are idempotent, this ordering reduces unnecessary reprocessing while maintaining
        // at-least-once delivery guarantees. The snapshot will capture the clean state after purge.
        tracing::info!("Purging acknowledged messages and performing snapshot of radix tree");
        let start_time = std::time::Instant::now();

        // Clean up stale workers before snapshot
        // Get current worker IDs from instances_rx
        let current_instances = self.instances_rx.borrow().clone();
185
        let current_worker_ids: std::collections::HashSet<u64> = current_instances
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
            .iter()
            .map(|instance| instance.instance_id)
            .collect();

        // Get worker IDs from the indexer
        let (resp_tx, resp_rx) = tokio::sync::oneshot::channel();
        let get_workers_req = GetWorkersRequest { resp: resp_tx };

        if let Err(e) = self.get_workers_tx.send(get_workers_req).await {
            tracing::warn!("Failed to send get_workers request during snapshot: {e:?}");
        } else {
            match resp_rx.await {
                Ok(indexer_worker_ids) => {
                    // Find workers in indexer but not in current instances
                    for worker_id in indexer_worker_ids {
                        if !current_worker_ids.contains(&worker_id) {
                            tracing::info!(
203
                                "Removing stale worker {worker_id} from indexer during snapshot"
204
205
206
                            );
                            if let Err(e) = remove_worker_tx.send(worker_id).await {
                                tracing::warn!(
207
                                    "Failed to send remove_worker for stale worker {worker_id}: {e:?}"
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
                                );
                            }
                        }
                    }
                }
                Err(e) => {
                    tracing::warn!("Failed to receive worker IDs from indexer: {e:?}");
                }
            }
        }

        // First, purge acknowledged messages from the stream
        nats_queue.purge_acknowledged().await?;

        // Now request a snapshot from the indexer (which reflects the post-purge state)
        let (resp_tx, resp_rx) = oneshot::channel();
        let dump_req = DumpRequest { resp: resp_tx };

        self.snapshot_tx
            .send(dump_req)
            .await
            .map_err(|e| anyhow::anyhow!("Failed to send dump request: {e:?}"))?;

        // Wait for the dump response
        let events = resp_rx
            .await
            .map_err(|e| anyhow::anyhow!("Failed to receive dump response: {e:?}"))?;

236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
        // Upload the snapshot to NATS object store in background (non-blocking)
        let nats_client = self.nats_client.clone();
        let bucket_name = self.bucket_name.clone();
        let event_count = events.len();
        tokio::spawn(async move {
            let Ok(url) = url::Url::parse(&format!(
                "nats://{}/{bucket_name}/{RADIX_STATE_FILE}",
                nats_client.addr(),
            )) else {
                tracing::warn!("Failed to parse snapshot URL");
                return;
            };

            if let Err(e) = nats_client.object_store_upload_data(&events, &url).await {
                tracing::warn!("Failed to upload snapshot: {e:?}");
                return;
            }
253

254
255
256
257
258
            tracing::info!(
                "Successfully uploaded snapshot with {event_count} events to bucket {bucket_name} in {}ms",
                start_time.elapsed().as_millis()
            );
        });
259
260
261

        Ok(())
    }
262
263
264
}

/// Start a unified background task for event consumption and optional snapshot management
265
#[allow(clippy::too_many_arguments)]
266
267
pub async fn start_kv_router_background(
    component: Component,
268
    consumer_id: String,
269
    kv_events_tx: mpsc::Sender<RouterEvent>,
270
271
272
    remove_worker_tx: mpsc::Sender<WorkerId>,
    maybe_get_workers_tx: Option<mpsc::Sender<GetWorkersRequest>>,
    maybe_snapshot_tx: Option<mpsc::Sender<DumpRequest>>,
273
274
275
276
277
    cancellation_token: CancellationToken,
    router_snapshot_threshold: Option<u32>,
    router_reset_states: bool,
) -> Result<()> {
    // Set up NATS connections
278
    let stream_name = create_kv_stream_name(&component, KV_EVENT_SUBJECT);
279
280
    let nats_server = std::env::var(env_nats::NATS_SERVER)
        .unwrap_or_else(|_| "nats://localhost:4222".to_string());
281
282
283
284
285
286

    // Create NatsQueue for event consumption
    let mut nats_queue = NatsQueue::new_with_consumer(
        stream_name.clone(),
        nats_server.clone(),
        std::time::Duration::from_secs(60), // 1 minute timeout
287
        consumer_id.clone(),
288
289
290
291
292
293
294
295
296
297
    );
    nats_queue.connect_with_reset(router_reset_states).await?;

    // Always create NATS client (needed for both reset and snapshots)
    let client_options = dynamo_runtime::transports::nats::Client::builder()
        .server(&nats_server)
        .build()?;
    let nats_client = client_options.connect().await?;

    // Create bucket name for snapshots/state
298
299
300
301
302
303
    let event_plane_subject = format!(
        "namespace.{}.component.{}",
        component.namespace().name(),
        component.name()
    );
    let bucket_name = Slug::slugify(&format!("{}-{RADIX_STATE_BUCKET}", event_plane_subject))
304
305
306
307
        .to_string()
        .replace("_", "-");

    // Handle initial state based on router_reset_states flag
308
309
310
311
    if !router_reset_states {
        // Try to download initial state from object store with stability check
        download_stable_snapshot(&nats_client, &bucket_name, &kv_events_tx).await?;
    } else {
312
313
314
315
316
317
318
        // Delete the bucket to reset state
        tracing::info!("Resetting router state, deleting bucket: {bucket_name}");
        if let Err(e) = nats_client.object_store_delete_bucket(&bucket_name).await {
            tracing::warn!("Failed to delete bucket (may not exist): {e:?}");
        }
    }

319
    // Cleanup orphaned consumers on startup
320
    cleanup_orphaned_consumers(&mut nats_queue, &component, &consumer_id).await;
321

322
323
    // Wait for at least one worker instance before proceeding
    let mut instance_event_stream =
324
        get_instance_discovery_stream(&component, &cancellation_token).await?;
325
326

    // Watch for router deletions to clean up orphaned consumers via discovery
327
328
    let generate_endpoint = component.endpoint("generate");
    let discovery_client = component.drt().discovery();
329
330
331
    let router_discovery_key = router_discovery_query(component.namespace().name());
    let mut router_event_stream = discovery_client
        .list_and_watch(router_discovery_key, Some(cancellation_token.clone()))
332
        .await?;
333

334
335
    // Get instances_rx for tracking current workers
    let client = generate_endpoint.client().await?;
336
    let instances_rx = client.instance_source.as_ref().clone();
337
338
339
340
341
342
343

    // Only set up snapshot-related resources if snapshot_tx, get_workers_tx, and threshold are provided
    let snapshot_resources = if let (Some(get_workers_tx), Some(snapshot_tx), Some(_)) = (
        maybe_get_workers_tx,
        maybe_snapshot_tx,
        router_snapshot_threshold,
    ) {
344
345
346
        Some(SnapshotResources {
            nats_client,
            bucket_name,
347
348
349
            instances_rx,
            get_workers_tx,
            snapshot_tx,
350
351
352
353
354
        })
    } else {
        None
    };

355
    tokio::spawn(async move {
356
357
358
359
360
361
362
        // Create interval with jitter
        let jitter_ms =
            rand::rng().random_range(-CHECK_INTERVAL_JITTER_MS..=CHECK_INTERVAL_JITTER_MS);
        let interval_duration = Duration::from_millis(
            (CHECK_INTERVAL_BASE.as_millis() as i64 + jitter_ms).max(1) as u64,
        );
        let mut check_interval = tokio::time::interval(interval_duration);
363
364
365
366
367
368
369
370
371
        check_interval.set_missed_tick_behavior(tokio::time::MissedTickBehavior::Skip);

        loop {
            tokio::select! {
                biased;

                _ = cancellation_token.cancelled() => {
                    tracing::debug!("KV Router background task received cancellation signal");
                    // Clean up the queue and remove the durable consumer
372
                    // TODO: durable consumer cannot cleanup if ungraceful shutdown (crash)
373
374
375
376
377
378
                    if let Err(e) = nats_queue.shutdown(None).await {
                        tracing::warn!("Failed to shutdown NatsQueue: {e}");
                    }
                    break;
                }

379
                // Handle generate endpoint instance deletion events
380
381
                Some(discovery_event_result) = instance_event_stream.next() => {
                    let Ok(discovery_event) = discovery_event_result else {
382
383
384
                        continue;
                    };

385
                    let DiscoveryEvent::Removed(id) = discovery_event else {
386
387
388
                        continue;
                    };

389
390
                    let worker_id = id.instance_id();

391
                    tracing::warn!(
392
                        "DISCOVERY: Generate endpoint instance removed, removing worker {worker_id}"
393
                    );
394
395

                    if let Err(e) = remove_worker_tx.send(worker_id).await {
396
                        tracing::warn!("Failed to send worker removal for worker {worker_id}: {e}");
397
398
399
                    }
                }

400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
                // Handle event consumption
                result = nats_queue.dequeue_task(None) => {
                    match result {
                        Ok(Some(bytes)) => {
                            let event: RouterEvent = match serde_json::from_slice(&bytes) {
                                Ok(event) => event,
                                Err(e) => {
                                    tracing::warn!("Failed to deserialize RouterEvent: {e:?}");
                                    continue;
                                }
                            };

                            // Forward the RouterEvent to the indexer
                            if let Err(e) = kv_events_tx.send(event).await {
                                tracing::warn!(
                                    "failed to send kv event to indexer; shutting down: {e:?}"
                                );
                                break;
                            }
                        },
                        Ok(None) => {
                            tracing::trace!("Dequeue timeout, continuing");
                        },
                        Err(e) => {
                            tracing::error!("Failed to dequeue task: {e:?}");
                            tokio::time::sleep(std::time::Duration::from_millis(100)).await;
                        }
                    }
                }

430
                // Handle periodic stream checking and purging (only if snapshot_resources is provided)
431
                _ = check_interval.tick() => {
432
                    let Some(resources) = snapshot_resources.as_ref() else {
433
434
435
436
437
438
439
440
441
442
                        continue;
                    };

                    // Check total messages in the stream
                    let Ok(message_count) = nats_queue.get_stream_messages().await else {
                        tracing::warn!("Failed to get stream message count");
                        continue;
                    };

                    let threshold = router_snapshot_threshold.unwrap_or(u32::MAX) as u64;
443

444
445
446
447
                    if message_count <= threshold {
                        continue;
                    }

448
                    tracing::info!("Stream has {message_count} messages (threshold: {threshold}), performing purge and snapshot");
449

450
                    match resources.purge_then_snapshot(
451
                        &mut nats_queue,
452
                        &remove_worker_tx,
453
454
                    ).await {
                        Ok(_) => tracing::info!("Successfully performed purge and snapshot"),
455
                        Err(e) => tracing::debug!("Could not perform purge and snapshot: {e:?}"),
456
457
458
                    }
                }

459
460
461
                // Handle router deletion events via discovery
                Some(router_event_result) = router_event_stream.next() => {
                    let Ok(router_event) = router_event_result else {
462
463
464
                        continue;
                    };

465
                    let DiscoveryEvent::Removed(id) = router_event else {
466
                        // We only care about removals for cleaning up consumers
467
468
469
                        continue;
                    };

470
471
                    let router_instance_id = id.instance_id();

472
                    // The consumer ID is the instance_id as a string
473
                    let consumer_to_delete = router_instance_id.to_string();
474

475
                    tracing::info!(
476
                        "DISCOVERY: Router instance {router_instance_id} removed, attempting to delete orphaned consumer: {consumer_to_delete}"
477
                    );
478

479
480
481
                    // Delete the consumer (allow race condition if multiple routers try to delete)
                    if let Err(e) = nats_queue.shutdown(Some(consumer_to_delete.clone())).await {
                        tracing::warn!("Failed to delete consumer {consumer_to_delete}: {e}");
482
                    } else {
483
                        tracing::info!("Successfully deleted orphaned consumer: {consumer_to_delete}");
484
485
486
487
488
489
490
491
492
493
494
495
496
497
                    }
                }
            }
        }

        // Clean up the queue and remove the durable consumer
        if let Err(e) = nats_queue.shutdown(None).await {
            tracing::warn!("Failed to shutdown NatsQueue: {e}");
        }
    });

    Ok(())
}

498
499
500
501
502
503
504
505
506
507
508
509
510
511
/// Handle a worker discovery event (added or removed).
async fn handle_worker_discovery(
    event: DiscoveryEvent,
    worker_query_client: &WorkerQueryClient,
    kv_events_tx: &mpsc::Sender<RouterEvent>,
    remove_worker_tx: &mpsc::Sender<WorkerId>,
) {
    match event {
        DiscoveryEvent::Added(instance) => {
            let worker_id = instance.instance_id();
            tracing::info!(
                "DISCOVERY: Worker {worker_id} added, dumping local indexer into router"
            );

512
513
514
515
516
517
518
519
            let total_recovered = worker_query_client
                .recover_all_dp_ranks(worker_id, kv_events_tx)
                .await;

            if total_recovered > 0 {
                tracing::info!(
                    "DISCOVERY: Worker {worker_id} total recovered {total_recovered} events"
                );
520
521
            }
        }
522
523
        DiscoveryEvent::Removed(id) => {
            let worker_id = id.instance_id();
524
525
526
527
528
529
530
531
532
            tracing::warn!("DISCOVERY: Worker {worker_id} removed, removing from router indexer");

            if let Err(e) = remove_worker_tx.send(worker_id).await {
                tracing::warn!("Failed to send worker removal for worker {worker_id}: {e}");
            }
        }
    }
}

533
/// Start a simplified background task for event consumption using the event plane.
534
535
536
///
/// This is used when local indexer mode is enabled. Unlike `start_kv_router_background`,
/// this function:
537
/// - Uses the event plane (NATS Core or ZMQ) instead of JetStream
538
539
540
541
/// - Does not support snapshots, purging, or durable consumers
/// - On worker Added: dumps worker's local indexer into router
/// - On worker Removed: removes worker from router indexer
///
542
543
544
/// This function first recovers state from all currently registered workers before
/// spawning the background task, ensuring the router is ready before returning.
///
545
/// This is appropriate when workers have local indexers enabled.
546
pub async fn start_kv_router_background_event_plane(
547
548
549
550
    component: Component,
    kv_events_tx: mpsc::Sender<RouterEvent>,
    remove_worker_tx: mpsc::Sender<WorkerId>,
    cancellation_token: CancellationToken,
551
    mut worker_query_client: WorkerQueryClient,
552
    transport_kind: EventTransportKind,
553
) -> Result<()> {
554
555
556
557
558
559
560
561
562
563
    // Subscribe to KV events using the selected event plane transport
    let mut subscriber =
        EventSubscriber::for_component_with_transport(&component, KV_EVENT_SUBJECT, transport_kind)
            .await?
            .typed::<RouterEvent>();
    let kv_event_subject = format!(
        "namespace.{}.component.{}.{}",
        component.namespace().name(),
        component.name(),
        KV_EVENT_SUBJECT
564
565
    );

566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
    match transport_kind {
        EventTransportKind::Nats => {
            tracing::info!(
                subject = %kv_event_subject,
                "KV Router using NATS Core subscription (local_indexer mode)"
            );
        }
        EventTransportKind::Zmq => {
            tracing::info!(
                subject = %kv_event_subject,
                "KV Router using ZMQ event plane subscription (local_indexer mode)"
            );
        }
    }

581
582
583
584
585
586
587
588
589
    // Wait for at least one worker with a known runtime config before proceeding.
    // This ensures we have actual config data (including enable_local_indexer) available.
    tracing::info!("KV subscriber waiting for at least one worker with runtime config...");
    let ready_workers = worker_query_client.wait_for_ready().await;
    tracing::info!(
        "KV subscriber found {} worker(s) with runtime config, proceeding",
        ready_workers.len()
    );

590
    // Recover initial state from all ready workers (all dp_ranks)
591
592
    for worker_id in &ready_workers {
        if worker_query_client.has_local_indexer(*worker_id) {
593
594
595
            worker_query_client
                .recover_all_dp_ranks(*worker_id, &kv_events_tx)
                .await;
596
597
598
        }
    }

599
600
601
602
    // Get instance discovery stream for ongoing monitoring of worker add/remove events
    let mut instance_event_stream =
        get_instance_discovery_stream(&component, &cancellation_token).await?;

603
    tokio::spawn(async move {
604
605
606
        // Track last received event ID per (worker, dp_rank) for gap detection
        // Each dp_rank has its own monotonic event ID sequence
        let mut last_event_ids: HashMap<(WorkerId, DpRank), u64> = HashMap::new();
607
608
609
610
611
612

        loop {
            tokio::select! {
                biased;

                _ = cancellation_token.cancelled() => {
613
                    tracing::debug!("KV Router event plane background task received cancellation signal");
614
615
616
617
618
                    break;
                }

                // Handle generate endpoint instance add/remove events
                Some(discovery_event_result) = instance_event_stream.next() => {
619
                    let Ok(event) = discovery_event_result else {
620
621
622
                        continue;
                    };

623
624
625
626
627
628
629
                    handle_worker_discovery(
                        event,
                        &worker_query_client,
                        &kv_events_tx,
                        &remove_worker_tx,
                    )
                    .await;
630
631
                }

632
633
634
635
                // Handle event consumption from event plane subscription
                Some(result) = subscriber.next() => {
                    let (envelope, event) = match result {
                        Ok((envelope, event)) => (envelope, event),
636
                        Err(e) => {
637
                            tracing::warn!("Failed to receive RouterEvent from event plane: {e:?}");
638
639
640
641
642
                            continue;
                        }
                    };

                    let worker_id = event.worker_id;
643
                    let dp_rank = event.event.dp_rank;
644
                    let event_id = event.event.event_id;
645
                    let event_key = (worker_id, dp_rank);
646

647
648
649
650
651
652
653
                    // Use envelope metadata for additional debugging
                    tracing::trace!(
                        "Received event from publisher {} (seq {})",
                        envelope.publisher_id,
                        envelope.sequence
                    );

654
                    // Gap detection: check if event ID is monotonically increasing per (worker, dp_rank)
655
                    // Note: event_id <= last_id is duplicate/out-of-order, apply anyway (idempotent)
656
                    if let Some(&last_id) = last_event_ids.get(&event_key)
657
658
659
660
661
                        && event_id > last_id + 1
                    {
                        // Gap detected - recover missing events before processing current
                        let gap_start = last_id + 1;
                        let gap_end = event_id - 1;
662
                        let gap_size = gap_end - gap_start + 1;
663
                        tracing::warn!(
664
                            "Event ID gap detected for worker {worker_id} dp_rank {dp_rank}, recovering events [{gap_start}, {gap_end}], gap_size: {gap_size}"
665
666
                        );

667
                        // Note: While recovering, new events may queue in the subscriber's
668
669
                        // internal buffer. We don't explicitly buffer them here for simplicity.
                        // The subscriber will process them in order after recovery completes.
670
671
672
673
                        if let Err(e) = worker_query_client
                            .recover_from_worker(worker_id, dp_rank, Some(gap_start), Some(gap_end), &kv_events_tx)
                            .await
                        {
674
                            tracing::error!(
675
                                "Failed to recover gap events for worker {worker_id} dp_rank {dp_rank} (gap_start: {gap_start}, gap_end: {gap_end}); proceeding with current event anyway: {e}"
676
677
678
679
680
                            );
                            // Note: If recovery fails, we still apply the current event.
                            // The tree will have a gap, but it's better than dropping the event.
                        }
                    }
681
                    // First event from this (worker, dp_rank) is always valid - we accept whatever ID it has.
682
683
684
685
                    // This handles initial startup and worker restarts without requiring event 0.

                    // Update last seen event ID (use max to handle out-of-order)
                    last_event_ids
686
                        .entry(event_key)
687
688
689
690
691
692
693
694
695
696
697
698
699
700
                        .and_modify(|id| *id = (*id).max(event_id))
                        .or_insert(event_id);

                    // Forward the RouterEvent to the indexer
                    if let Err(e) = kv_events_tx.send(event).await {
                        tracing::warn!(
                            "failed to send kv event to indexer; shutting down: {e:?}"
                        );
                        break;
                    }
                }
            }
        }

701
        tracing::debug!("KV Router event plane background task exiting");
702
703
704
705
706
    });

    Ok(())
}

707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
/// Backwards-compatible wrapper for NATS Core local-indexer mode.
pub async fn start_kv_router_background_nats_core(
    component: Component,
    kv_events_tx: mpsc::Sender<RouterEvent>,
    remove_worker_tx: mpsc::Sender<WorkerId>,
    cancellation_token: CancellationToken,
    worker_query_client: WorkerQueryClient,
) -> Result<()> {
    start_kv_router_background_event_plane(
        component,
        kv_events_tx,
        remove_worker_tx,
        cancellation_token,
        worker_query_client,
        EventTransportKind::Nats,
    )
    .await
}

726
/// Cleanup orphaned NATS consumers that no longer have corresponding router entries
727
728
729
async fn cleanup_orphaned_consumers(
    nats_queue: &mut NatsQueue,
    component: &Component,
730
    consumer_id: &str,
731
732
733
734
735
) {
    let Ok(consumers) = nats_queue.list_consumers().await else {
        return;
    };

736
737
738
739
740
741
742
    // Get active routers from discovery
    let discovery = component.drt().discovery();
    let Ok(router_instances) = discovery
        .list(router_discovery_query(component.namespace().name()))
        .await
    else {
        tracing::debug!("Failed to list router instances from discovery, skipping cleanup");
743
744
745
        return;
    };

746
747
    // Build set of active router instance IDs
    let active_instance_ids: HashSet<String> = router_instances
748
        .iter()
749
        .map(|instance| instance.instance_id().to_string())
750
751
752
        .collect();

    for consumer in consumers {
753
        if consumer == consumer_id {
754
755
756
            // Never delete myself (extra/redundant safeguard)
            continue;
        }
757
        if !active_instance_ids.contains(&consumer) {
758
            tracing::info!("Cleaning up orphaned consumer: {consumer}");
759
760
761
762
            let _ = nats_queue.shutdown(Some(consumer)).await;
        }
    }
}