fix(managed): expose dropped subscription events

Track a monotonic discarded-event count per bounded subscription for all overflow policies, including after hub sealing or disconnection. Preserve nonblocking publication and existing queue policies.

Warn once in streaming CLI output and mark TUI summaries/status as incomplete when DropOldest discarded events. Add exact overflow-counter and incomplete-marker regressions.
This commit is contained in:
Nils Andreas Svee committed 2026-07-28 01:04:43 +07:00
1 parent 41cd2a9589
commit 6adec06442
4 files changed
+111 -4

No files matched your search

+19
View File
@@ -399,6 +399,9 @@ fn run_group_stream(
}
}
}
if let Some(warning) = dropped_event_warning(events.dropped_events()) {
eprintln!("{warning}");
}
if outcome.end_reason == ManagedGroupEndReason::Cancelled && !interrupted {
return Err("managed client group was cancelled".into());
@@ -446,6 +449,14 @@ fn report_target_failure(target: &ManagedTargetOutcome) {
}
}
fn dropped_event_warning(dropped_events: u64) -> Option<String> {
(dropped_events > 0).then(|| {
format!(
"irtt-rs: warning: dropped {dropped_events} managed group events; output and statistics may be incomplete"
)
})
}
fn estimated_group_completion_grace(args: &ClientArgs) -> Duration {
let open_timeout: Duration = args.to_client_config().open_timeouts.iter().sum();
open_timeout
@@ -598,6 +609,14 @@ mod tests {
OutputConfig::new(format, columns, header, verbose, false).unwrap()
}
#[test]
fn dropped_event_warning_marks_statistics_incomplete() {
assert_eq!(dropped_event_warning(0), None);
let warning = dropped_event_warning(7).unwrap();
assert!(warning.contains("dropped 7 managed group events"));
assert!(warning.contains("statistics may be incomplete"));
}
#[test]
fn output_helper_streams_and_collects_events() {
let sent_at = test_timestamp(Duration::from_secs(1));
+1
View File
@@ -242,6 +242,7 @@ fn run_group_tui(
}
}
}
state.mark_dropped_events(events.dropped_events());
for target in &outcome.targets {
if terminal_targets.insert(target.id.as_str().to_owned()) {
state.process_target_outcome(target);
+37 -1
View File
@@ -96,6 +96,7 @@ pub(super) struct TuiState {
targets: Vec<TuiTargetState>,
recent_events: VecDeque<String>,
last_warning: Option<String>,
dropped_events: u64,
graph_metric: GraphMetric,
graph_viewport: GraphViewport,
view: TuiView,
@@ -130,6 +131,7 @@ impl TuiState {
targets,
recent_events: VecDeque::with_capacity(RECENT_EVENT_LIMIT),
last_warning: None,
dropped_events: 0,
graph_metric: GraphMetric::EffectiveRtt,
graph_viewport: GraphViewport::default(),
view: TuiView::Graph,
@@ -386,6 +388,17 @@ impl TuiState {
self.status = status;
}
pub(super) fn mark_dropped_events(&mut self, dropped_events: u64) {
if dropped_events == 0 {
return;
}
self.dropped_events = dropped_events;
let warning =
format!("dropped {dropped_events} managed group events; statistics may be incomplete");
self.last_warning = Some(warning.clone());
self.push_event(format!("warning {warning}"));
}
pub(super) fn set_error(&mut self, message: String) {
self.status = TuiStatus::Error;
self.last_warning = Some(message.clone());
@@ -1811,6 +1824,11 @@ fn status_line(state: &TuiState) -> Paragraph<'_> {
TuiView::Graph => "g dashboard",
TuiView::Dashboard => "g graph",
};
let incomplete = if state.dropped_events > 0 {
format!(" incomplete:dropped={}", state.dropped_events)
} else {
String::new()
};
let controls = if state.graph_viewport.mode == GraphViewportMode::Follow {
format!(
"q quit | r reset | p pause | {view_hint} | m metric | arrows pan | +/- zoom | 0 reset window"
@@ -1821,10 +1839,11 @@ fn status_line(state: &TuiState) -> Paragraph<'_> {
)
};
let lines = vec![Line::from(format!(
"{}{}{} | {}",
"{}{}{}{} | {}",
state.status.label(),
paused,
quitting,
incomplete,
controls
))];
Paragraph::new(lines).block(Block::default().borders(Borders::ALL))
@@ -2451,6 +2470,23 @@ mod tests {
.contains("warning WrongToken: wrong token"));
}
#[test]
fn dropped_events_mark_tui_statistics_incomplete() {
let mut state = TuiState::default();
state.mark_dropped_events(9);
assert_eq!(state.dropped_events, 9);
assert!(state
.last_warning
.as_deref()
.is_some_and(|warning| warning.contains("statistics may be incomplete")));
assert!(state
.recent_events
.back()
.is_some_and(|event| event.contains("dropped 9 managed group events")));
}
#[test]
fn recent_event_buffer_stays_bounded() {
let mut state = TuiState::default();