Skip to content

Avoid leaking sitrep rows during deletion #10143

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
smklein merged 14 commits into from
Apr 2, 2026
Merged

Avoid leaking sitrep rows during deletion #10143

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2e57643
Avoid leaking sitrep rows during deletion
smklein Mar 24, 2026
1d0c779
stronger UUID types
smklein Mar 24, 2026
134911d
cope with a batch size of 1
smklein Mar 24, 2026
86a56f0
if you've been scanning for full table scans, you can keep scanning
smklein Mar 24, 2026
a2d5bae
fmt
smklein Mar 24, 2026
076920b
Background task talks about batches now
smklein Mar 25, 2026
a88fd11
Test to check for partially deleted sitreps
smklein Mar 25, 2026
8362260
results
smklein Mar 25, 2026
d183381
cfg test
smklein Mar 25, 2026
0cc8fa3
cleanup warnings
smklein Mar 25, 2026
e91f27e
merge
smklein Mar 30, 2026
5ffc33f
strum and macros
smklein Mar 30, 2026
6e81e7a
default sitrep_id
smklein Mar 30, 2026
a8208b2
feedback
smklein Apr 1, 2026
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
29 changes: 22 additions & 7 deletions dev-tools/omdb/src/bin/omdb/nexus.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3454,8 +3454,10 @@ fn print_task_fm_sitrep_loader(details: &serde_json::Value) {

fn print_task_fm_sitrep_gc(details: &serde_json::Value) {
let SitrepGcStatus {
orphaned_sitreps_found,
orphaned_sitreps_deleted,
orphaned_cases_deleted,
orphaned_case_ereports_deleted,
orphaned_alert_requests_deleted,
errors,
} = match serde_json::from_value::<SitrepGcStatus>(details.clone()) {
Err(error) => {
Expand All @@ -3468,11 +3470,18 @@ fn print_task_fm_sitrep_gc(details: &serde_json::Value) {
Ok(status) => status,
};

pub const ORPHANS_FOUND: &str = "orphaned sitreps found:";
pub const ORPHANS_DELETED: &str = "orphaned sitreps deleted:";
pub const SITREPS_DELETED: &str = "orphaned sitreps deleted:";
pub const CASES_DELETED: &str = "orphaned cases deleted:";
pub const EREPORTS_DELETED: &str = "orphaned case ereports deleted:";
pub const ALERTS_DELETED: &str = "orphaned alert requests deleted:";
pub const ERRORS: &str = "errors:";
pub const WIDTH: usize =
const_max_len(&[ERRORS, ORPHANS_FOUND, ORPHANS_DELETED]) + 1;
pub const WIDTH: usize = const_max_len(&[
ERRORS,
SITREPS_DELETED,
CASES_DELETED,
EREPORTS_DELETED,
ALERTS_DELETED,
]) + 1;
pub const NUM_WIDTH: usize = 4;
if !errors.is_empty() {
println!("{ERRICON} {ERRORS:<WIDTH$}{:>NUM_WIDTH$}", errors.len());
Expand All @@ -3481,9 +3490,15 @@ fn print_task_fm_sitrep_gc(details: &serde_json::Value) {
}
}

println!(" {ORPHANS_FOUND:<WIDTH$}{orphaned_sitreps_found:>NUM_WIDTH$}");
println!(
" {ORPHANS_DELETED:<WIDTH$}{orphaned_sitreps_deleted:>NUM_WIDTH$}"
" {SITREPS_DELETED:<WIDTH$}{orphaned_sitreps_deleted:>NUM_WIDTH$}"
);
println!(" {CASES_DELETED:<WIDTH$}{orphaned_cases_deleted:>NUM_WIDTH$}");
println!(
" {EREPORTS_DELETED:<WIDTH$}{orphaned_case_ereports_deleted:>NUM_WIDTH$}"
);
println!(
" {ALERTS_DELETED:<WIDTH$}{orphaned_alert_requests_deleted:>NUM_WIDTH$}"
);
}

Expand Down
12 changes: 8 additions & 4 deletions dev-tools/omdb/tests/successes.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,8 +697,10 @@ task: "fm_sitrep_gc"
configured period: every <REDACTED_DURATION>s
last completed activation: <REDACTED ITERATIONS>, triggered by <TRIGGERED_BY_REDACTED>
started at <REDACTED_TIMESTAMP> (<REDACTED DURATION>s ago) and ran for <REDACTED DURATION>ms
orphaned sitreps found: 0
orphaned sitreps deleted: 0
orphaned sitreps deleted: 0
orphaned cases deleted: 0
orphaned case ereports deleted: 0
orphaned alert requests deleted: 0

task: "fm_sitrep_loader"
configured period: every <REDACTED_DURATION>s
Expand Down Expand Up @@ -1314,8 +1316,10 @@ task: "fm_sitrep_gc"
configured period: every <REDACTED_DURATION>s
last completed activation: <REDACTED ITERATIONS>, triggered by <TRIGGERED_BY_REDACTED>
started at <REDACTED_TIMESTAMP> (<REDACTED DURATION>s ago) and ran for <REDACTED DURATION>ms
orphaned sitreps found: 0
orphaned sitreps deleted: 0
orphaned sitreps deleted: 0
orphaned cases deleted: 0
orphaned case ereports deleted: 0
orphaned alert requests deleted: 0

task: "fm_sitrep_loader"
configured period: every <REDACTED_DURATION>s
Expand Down
Loading
Loading