Skip to content

Ignore unmatched jobs in subsequent checks #8

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
merged 2 commits into from
Nov 7, 2024
Merged

Ignore unmatched jobs in subsequent checks #8

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ba5e9e
ignore unmatched jobs after the first time they were found
upsj Nov 7, 2024
6edce74
hide message about unmatched jobs
upsj Nov 7, 2024
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
17 changes: 9 additions & 8 deletions src/run.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,23 +65,22 @@ fn find_match<'a>(
})
.min_by_key(|i| i.1.tags.len())
.or_else(|| {
info!("Could not find a suitable runner for pending job {:?}", job);
debug!("Could not find a suitable runner for pending job {:?}", job);
None
})
}

async fn check_jobs<'a>(
state: &'a MetaRunnerState,
) -> anyhow::Result<Vec<(&'a String, &'a GitLabRunnerInstance, Job)>> {
) -> anyhow::Result<(Vec<(&'a String, &'a GitLabRunnerInstance, Job)>, Vec<Job>)> {
let jobs = fetch_pending_project_jobs(&state.client, &state.project).await?;
Ok(jobs
.into_iter()
.filter(|job| !state.successful_job_ids.contains(&job.id))
.filter_map(|job| match find_match(&state.config.runners, &job) {
None => None,
Some((name, instance)) => Some((name, instance, job)),
})
.collect())
.partition_map(|job| match find_match(&state.config.runners, &job) {
None => Either::Right(job),
Some((name, instance)) => Either::Left((name, instance, job)),
}))
}

async fn launch_runner(config: &GitLabLaunchConfig) -> anyhow::Result<()> {
Expand Down Expand Up @@ -169,7 +168,7 @@ impl Display for PrintableJobVec<'_> {
}

async fn run_impl(paths: &cli::Paths, state: &MetaRunnerState) -> anyhow::Result<Vec<u64>> {
let matched_jobs = check_jobs(state).await?;
let (matched_jobs, ignored_jobs) = check_jobs(state).await?;
// Group jobs by runner instance
let mut grouped_matched_jobs = HashMap::new();
for (name, instance, job) in matched_jobs.iter() {
Expand Down Expand Up @@ -241,6 +240,8 @@ async fn run_impl(paths: &cli::Paths, state: &MetaRunnerState) -> anyhow::Result
)
}
}
// ignore any jobs that we couldn't find a runner for
successful.extend(ignored_jobs.into_iter().map(|job| job.id));
Ok(successful)
}

Expand Down