Skip to content

fix: try to vacuum non-default branches #4911

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
jtmcdole merged 1 commit into from
Jan 15, 2026
Merged

fix: try to vacuum non-default branches #4911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion app_dart/lib/src/request_handlers/scheduler/batch_backfiller.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,9 @@ final class BatchBackfiller extends RequestHandler {
(commit, [...tasks.map((t) => t.toRef())]),
], postsubmitTargets: currentTargets);
}
log.debug('Built a grid of ${grid.eligibleTasks.length} target columns');
log.debug(
'Built a grid of ${grid.eligibleTasks.length} target columns for $grid',
);

// Produce a list of tasks, ordered from highest to lowest, to backfill.
// ... but only take the top N tasks, at most.
Expand Down
29 changes: 23 additions & 6 deletions app_dart/lib/src/request_handlers/vacuum_github_commits.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,28 @@ final class VacuumGithubCommits extends ApiRequestHandler {
'Listing commit for slug: $slug branch: $branch and msSinceEpoch: '
'${queryAfter.millisecondsSinceEpoch}',
);
commits = await githubService.listBranchedCommits(
slug,
branch,
queryAfter.millisecondsSinceEpoch,
);

try {
commits = await githubService.listBranchedCommits(
slug,
branch,
queryAfter.millisecondsSinceEpoch,
);
} catch (e) {
log.error('Failed retrieving commits from githubService', e);

final gh = config.createGitHubClientWithToken(
await config.githubOAuthToken,
);
commits = await gh.repositories
.listCommits(
slug,
sha: branch,
since: queryAfter,
until: queryBefore,
)
.toList();
}
log.debug('Retrieved ${commits.length} commits from GitHub');
// Do not try to add recent commits as they may already be processed
// by cocoon, which can cause race conditions.
Expand All @@ -99,7 +116,7 @@ final class VacuumGithubCommits extends ApiRequestHandler {
)
.toList();
} on gh.GitHubError catch (e) {
log.error('Failed retriving commits from GitHub', e);
log.error('Failed retrieving commits from GitHub', e);
}

return [
Expand Down
Loading