Skip to content

Commit 3beddf0

Browse files
committed
Prepare admin sources in candidate generations
1 parent 2081742 commit 3beddf0

2 files changed

Lines changed: 17 additions & 10 deletions

File tree

src/main.rs

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2226,7 +2226,14 @@ mod tests {
22262226
run_id: &str,
22272227
window_size: usize,
22282228
) -> Result<()> {
2229-
self.prepare_wiki_snapshot(wiki, version, data_dir, run_id, window_size)
2229+
self.fail_if("fetch", "fetch failed")?;
2230+
self.fail_if("ingest", "ingest failed")?;
2231+
self.fail_if("cleanup_raw", "cleanup raw failed")?;
2232+
self.record(format!(
2233+
"candidate_source_window:{wiki}:{version}:{}:{run_id}:{window_size}",
2234+
data_dir.display()
2235+
));
2236+
Ok(())
22302237
}
22312238
}
22322239

@@ -2694,7 +2701,7 @@ mod tests {
26942701
assert_eq!(
26952702
ops.calls.into_inner(),
26962703
vec![
2697-
"source_window:nlwiki:2026-07:fixtures/data:2",
2704+
"candidate_source_window:nlwiki:2026-07:fixtures/data:run-7:2",
26982705
"compute:nlwiki:fixtures/data:fixtures/output/_candidates/nlwiki/2026-07/run-7",
26992706
"fetch_patrol:nlwiki:fixtures/data",
27002707
"compute_patrol:nlwiki:fixtures/data:fixtures/output/_candidates/nlwiki/2026-07/run-7:false:_",
@@ -2726,7 +2733,7 @@ mod tests {
27262733

27272734
assert_eq!(
27282735
ops.calls.into_inner(),
2729-
vec!["source_window:nlwiki:2026-07:fixtures/data:2"]
2736+
vec!["candidate_source_window:nlwiki:2026-07:fixtures/data:source-7:2"]
27302737
);
27312738
Ok(())
27322739
}
@@ -2759,7 +2766,7 @@ mod tests {
27592766
ops.calls.into_inner(),
27602767
vec![
27612768
"candidate_rebuild:nlwiki:2026-07:rebuild-7",
2762-
"source_window:nlwiki:2026-07:fixtures/data:1",
2769+
"candidate_source_window:nlwiki:2026-07:fixtures/data:rebuild-7:1",
27632770
"compute:nlwiki:fixtures/data:fixtures/output/_candidates/nlwiki/2026-07/rebuild-7",
27642771
"fetch_patrol:nlwiki:fixtures/data",
27652772
"compute_patrol:nlwiki:fixtures/data:fixtures/output/_candidates/nlwiki/2026-07/rebuild-7:false:_",
@@ -2798,7 +2805,7 @@ mod tests {
27982805
vec![
27992806
"qualification_lifecycle:itwiki",
28002807
"reset_obsolete_input:itwiki:2026-07",
2801-
"source_window:itwiki:2026-07:qualification/data:1",
2808+
"candidate_source_window:itwiki:2026-07:qualification/data:qualify-7:1",
28022809
"compute:itwiki:qualification/data:qualification/output/_qualifications/itwiki/2026-07/qualify-7",
28032810
"fetch_patrol:itwiki:qualification/data",
28042811
"compute_patrol:itwiki:qualification/data:qualification/output/_qualifications/itwiki/2026-07/qualify-7:false:_",
@@ -2902,7 +2909,7 @@ mod tests {
29022909
assert_eq!(
29032910
ops.calls.into_inner(),
29042911
vec![
2905-
"source_window:nlwiki:2026-07:fixtures/data:1",
2912+
"candidate_source_window:nlwiki:2026-07:fixtures/data:partial-run:1",
29062913
"candidate_ready:nlwiki:2026-07:partial-run",
29072914
]
29082915
);
@@ -2937,7 +2944,7 @@ mod tests {
29372944
assert_eq!(
29382945
ops.calls.into_inner(),
29392946
vec![
2940-
"source_window:nlwiki:2026-07:fixtures/data:1",
2947+
"candidate_source_window:nlwiki:2026-07:fixtures/data:cached-patrol-run:1",
29412948
"compute_patrol:nlwiki:fixtures/data:fixtures/output/_candidates/nlwiki/2026-07/cached-patrol-run:false:_",
29422949
"candidate_ready:nlwiki:2026-07:cached-patrol-run",
29432950
]
@@ -2974,7 +2981,7 @@ mod tests {
29742981
reused.calls.into_inner(),
29752982
vec![
29762983
"qualification_lifecycle:itwiki",
2977-
"source_window:itwiki:2026-07:qualification/data:1",
2984+
"candidate_source_window:itwiki:2026-07:qualification/data:qualification-reuse:1",
29782985
"qualification_ready:itwiki:2026-07:qualification-reuse",
29792986
]
29802987
);
@@ -3017,7 +3024,7 @@ mod tests {
30173024
ops.calls.into_inner(),
30183025
vec![
30193026
"qualification_lifecycle:itwiki",
3020-
"source_window:itwiki:2026-07:qualification/data:1",
3027+
"candidate_source_window:itwiki:2026-07:qualification/data:qualification-cached-patrol:1",
30213028
"compute_patrol:itwiki:qualification/data:qualification/output/_qualifications/itwiki/2026-07/qualification-cached-patrol:false:_",
30223029
"qualification_ready:itwiki:2026-07:qualification-cached-patrol",
30233030
]

src/orchestration.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@ pub(crate) fn handle_prepare_source(
530530
let window_size = source_window::configured_window_size(request.source_window_size)?;
531531
ops.persist_snapshot_plans(&wikis, &version, context.paths.data)?;
532532
timed_stage("source_window", Some(request.wiki), || {
533-
ops.prepare_wiki_snapshot(
533+
ops.prepare_candidate_snapshot(
534534
request.wiki,
535535
&version,
536536
context.paths.data,

0 commit comments

Comments
 (0)