You are viewing a plain text version of this content. The canonical link for it is here.
Posted to github@datafusion.apache.org by "alamb (via GitHub)" <gi...@apache.org> on 2026/10/14 13:57:48 UTC
[PR] ci: raise the merge queue status check timeout to 360 minutes [datafusion]
alamb opened a new pull request, #26293:
URL: https://github.com/apache/datafusion/pull/26293
## Which issue does this PR close?
- Part of #26292
## Rationale for this change
The merge queue evicts PRs whose checks have not reported within 60 minutes (the GitHub default), even when nothing failed and the remaining jobs are only waiting for a runner. Each eviction discards the CI that already passed, forces someone to re-queue the PR by hand, and reruns everything from scratch. See #26292 for examples and numbers.
Once the queue's CI is actually running it finishes in 10 to 25 minutes, so a longer timeout only changes what happens while jobs wait for runners: the entry stays queued and the finished work still counts.
## What changes are included in this PR?
Adds a `Merge Queue` ruleset to `.asf.yaml` that sets `check_response_timeout_minutes: 360`. Every other merge queue parameter is set to the value the queue has today (read back via the GraphQL API), so the only behavior change is the timeout:
| Parameter | Before | After |
|---|---|---|
| `check_response_timeout_minutes` | 60 | **360** |
| `max_entries_to_build` | 5 | 5 |
| `max_entries_to_merge` | 1 | 1 |
| `min_entries_to_merge` / wait | 1 / 5 min | 1 / 5 min |
| `merge_method` / `grouping_strategy` | SQUASH / ALLGREEN | SQUASH / ALLGREEN |
Notes:
- 360 minutes is the maximum the Rulesets API accepts for this field, so an 8 hour timeout is not possible.
- `.asf.yaml` has no dedicated merge queue syntax yet, but its `rulesets` feature passes raw Rulesets API payloads through, and `merge_queue` is one of the rule types. apache/datafusion-comet (apache/datafusion-comet#5843), apache/iceberg-rust and apache/seatunnel configure their queues this way. A convenience `merge_queue:` key is pending in apache/infrastructure-asfyaml#119.
- Our queue was originally enabled by ASF Infra directly in classic branch protection (INFRA-27154) before `.asf.yaml` supported rulesets. GitHub layers rulesets and branch protection, but its docs do not say which merge queue configuration wins when both exist on one branch. After this merges we should confirm the effective timeout with the GraphQL query below and, if the classic setting still applies, ask Infra to turn off the branch protection copy so the ruleset is the single source of truth.
- Merge queue rules reject wildcard ref patterns, so the ruleset covers only the default branch. Release branches keep their existing protection.
## What is the testing strategy for this PR?
- `python3 ci/scripts/check_asf_yaml_status_checks.py` passes.
- ASF's own schema validator, `asfyaml-validate` from apache/infrastructure-asfyaml, reports the file as valid.
- `.asf.yaml` only takes effect once it lands on `main`, so the real check is after merge:
```
gh api graphql -f query='{ repository(owner:"apache", name:"datafusion") {
mergeQueue(branch:"main") { configuration {
checkResponseTimeout maximumEntriesToBuild maximumEntriesToMerge
minimumEntriesToMerge minimumEntriesToMergeWaitTime mergeMethod mergingStrategy } } } }'
```
`checkResponseTimeout` should read `21600` (seconds) instead of today's `3600`, and `gh api repos/apache/datafusion/rulesets` should list a `Merge Queue` ruleset.
## Are there any user-facing changes?
No. This only changes how long an entry may wait in the merge queue before being evicted.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For additional commands, e-mail: github-help@datafusion.apache.org
Re: [PR] ci: raise the merge queue status check timeout to 360 minutes [datafusion]
Posted by "blaginin (via GitHub)" <gi...@apache.org>.
blaginin merged PR #26293:
URL: https://github.com/apache/datafusion/pull/26293
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For additional commands, e-mail: github-help@datafusion.apache.org
Re: [PR] ci: raise the merge queue status check timeout to 360 minutes [datafusion]
Posted by "alamb (via GitHub)" <gi...@apache.org>.
alamb commented on PR #26293:
URL: https://github.com/apache/datafusion/pull/26293#issuecomment-6176059595
The irony is not lost on me
<img width="1172" height="506" alt="Screenshot 2026-10-14 at 2 26 43 PM" src="https://github.com/user-attachments/assets/b9a458d1-5bba-4619-b94e-d0824fcf3386" />
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For additional commands, e-mail: github-help@datafusion.apache.org
Re: [PR] ci: raise the merge queue status check timeout to 360 minutes [datafusion]
Posted by "alamb (via GitHub)" <gi...@apache.org>.
alamb commented on PR #26293:
URL: https://github.com/apache/datafusion/pull/26293#issuecomment-6176051157
> i can force merge if no one objects?
Yes please 🙏
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For additional commands, e-mail: github-help@datafusion.apache.org
Re: [PR] ci: raise the merge queue status check timeout to 360 minutes [datafusion]
Posted by "blaginin (via GitHub)" <gi...@apache.org>.
blaginin commented on PR #26293:
URL: https://github.com/apache/datafusion/pull/26293#issuecomment-6175918099
i can force merge if no one objects?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For additional commands, e-mail: github-help@datafusion.apache.org
Re: [PR] ci: raise the merge queue status check timeout to 360 minutes [datafusion]
Posted by "alamb (via GitHub)" <gi...@apache.org>.
alamb commented on code in PR #26293:
URL: https://github.com/apache/datafusion/pull/26293#discussion_r4271819705
##########
.asf.yaml:
##########
@@ -112,6 +112,49 @@ github:
branch-55:
required_pull_request_reviews:
required_approving_review_count: 1
+ # GitHub merge queue settings for `main`.
+ #
+ # The merge queue itself was originally enabled by ASF Infra in classic
+ # branch protection (INFRA-27154), which .asf.yaml can not express. Rulesets
+ # can, and .asf.yaml passes raw Rulesets API payloads through unchanged, so
+ # the queue parameters are managed here. See
+ # https://github.com/apache/infrastructure-asfyaml#rulesets
+ #
+ # Merge queue rules do not support wildcard ref patterns, so only the default
+ # branch is covered; release branches keep plain branch protection above.
+ rulesets:
Review Comment:
Here are Comet's settings https://github.com/apache/datafusion-comet/blob/7d8d9b1544b734c85a93cca2cc9d5380ad70accd/.asf.yaml#L128-L176
```yaml
rulesets:
- name: Merge Queue
target: branch
enforcement: active
bypass_actors:
# apache/root - ASF Infra, so a wedged queue can always be recovered.
- actor_id: 118420
actor_type: Team
bypass_mode: always
conditions:
ref_name:
include:
- "~DEFAULT_BRANCH"
exclude: []
rules:
- type: merge_queue
parameters:
merge_method: SQUASH
grouping_strategy: ALLGREEN
max_entries_to_build: 4
min_entries_to_merge: 1
min_entries_to_merge_wait_minutes: 0
max_entries_to_merge: 5
check_response_timeout_minutes: 300
```
##########
.asf.yaml:
##########
@@ -112,6 +112,49 @@ github:
branch-55:
required_pull_request_reviews:
required_approving_review_count: 1
+ # GitHub merge queue settings for `main`.
+ #
+ # The merge queue itself was originally enabled by ASF Infra in classic
+ # branch protection (INFRA-27154), which .asf.yaml can not express. Rulesets
+ # can, and .asf.yaml passes raw Rulesets API payloads through unchanged, so
+ # the queue parameters are managed here. See
+ # https://github.com/apache/infrastructure-asfyaml#rulesets
+ #
+ # Merge queue rules do not support wildcard ref patterns, so only the default
+ # branch is covered; release branches keep plain branch protection above.
+ rulesets:
Review Comment:
Here are the current settings
```
(venv) andrewlamb@Andrews-MacBook-Pro-3:~/Software/datafusion$ gh api graphql -f query='{ repository(owner:"apache", name:"datafusion") {
mergeQueue(branch:"main") { configuration {
checkResponseTimeout maximumEntriesToBuild maximumEntriesToMerge
minimumEntriesToMerge minimumEntriesToMergeWaitTime mergeMethod mergingStrategy } } } }'
{
"data": {
"repository": {
"mergeQueue": {
"configuration": {
"checkResponseTimeout": 3600,
"maximumEntriesToBuild": 5,
"maximumEntriesToMerge": 1,
"minimumEntriesToMerge": 1,
"minimumEntriesToMergeWaitTime": 300,
"mergeMethod": "SQUASH",
"mergingStrategy": "ALLGREEN"
}
}
}
}
}
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For additional commands, e-mail: github-help@datafusion.apache.org
Re: [PR] ci: raise the merge queue status check timeout to 360 minutes [datafusion]
Posted by "alamb (via GitHub)" <gi...@apache.org>.
alamb commented on PR #26293:
URL: https://github.com/apache/datafusion/pull/26293#issuecomment-6172616439
Thanks @mbutrovich and @Omega359 -- I'll merge this one in and hopefully we can start to see our PRs make it through the queue
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For additional commands, e-mail: github-help@datafusion.apache.org
Re: [PR] ci: raise the merge queue status check timeout to 360 minutes [datafusion]
Posted by "codecov-commenter (via GitHub)" <gi...@apache.org>.
codecov-commenter commented on PR #26293:
URL: https://github.com/apache/datafusion/pull/26293#issuecomment-6173427280
## [Codecov](https://app.codecov.io/gh/apache/datafusion/pull/26293?dropdown=coverage&src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache) Report
:white_check_mark: All modified and coverable lines are covered by tests.
:white_check_mark: Project coverage is 82.79%. Comparing base ([`0d79252`](https://app.codecov.io/gh/apache/datafusion/commit/0d79252f61bd8777990b2749c216ffd07079c30d?dropdown=coverage&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache)) to head ([`210ec8d`](https://app.codecov.io/gh/apache/datafusion/commit/210ec8d28b911da698a7543f9254a585bb74b37b?dropdown=coverage&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache)).
<details><summary>Additional details and impacted files</summary>
```diff
@@ Coverage Diff @@
## main #26293 +/- ##
==========================================
- Coverage 82.80% 82.79% -0.01%
==========================================
Files 1149 1149
Lines 454146 454146
Branches 454146 454146
==========================================
- Hits 376035 376027 -8
- Misses 55260 55265 +5
- Partials 22851 22854 +3
```
</details>
[:umbrella: View full report in Codecov by Harness](https://app.codecov.io/gh/apache/datafusion/pull/26293?dropdown=coverage&src=pr&el=continue&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache).
:loudspeaker: Have feedback on the report? [Share it here](https://about.codecov.io/codecov-pr-comment-feedback/?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=apache).
<details><summary> :rocket: New features to boost your workflow: </summary>
- :snowflake: [Test Analytics](https://docs.codecov.com/docs/test-analytics): Detect flaky tests, report on failures, and find test suite problems.
- :package: [JS Bundle Analysis](https://docs.codecov.com/docs/javascript-bundle-analysis): Save yourself from yourself by tracking and limiting bundle sizes in JS merges.
</details>
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For additional commands, e-mail: github-help@datafusion.apache.org
Re: [PR] ci: raise the merge queue status check timeout to 360 minutes [datafusion]
Posted by "Omega359 (via GitHub)" <gi...@apache.org>.
Omega359 commented on PR #26293:
URL: https://github.com/apache/datafusion/pull/26293#issuecomment-6177249439
"[github-merge-queue](https://github.com/apps/github-merge-queue) Bot removed this pull request from the [merge queue](https://github.com/apache/datafusion/queue/main) due to no response for status checks [1 hour ago](https://github.com/apache/datafusion/pull/26293#event-33258312849)"
Now that is funny
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For additional commands, e-mail: github-help@datafusion.apache.org
Re: [PR] ci: raise the merge queue status check timeout to 360 minutes [datafusion]
Posted by "alamb (via GitHub)" <gi...@apache.org>.
alamb commented on PR #26293:
URL: https://github.com/apache/datafusion/pull/26293#issuecomment-6177761169
<img width="1111" height="124" alt="Screenshot 2026-10-14 at 4 28 42 PM" src="https://github.com/user-attachments/assets/fabe2d91-ba04-4fe5-b49b-8d75a6c07aa2" />
Thank you for dropping the 🔨 @blaginin
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For additional commands, e-mail: github-help@datafusion.apache.org
Re: [PR] ci: raise the merge queue status check timeout to 360 minutes [datafusion]
Posted by "Omega359 (via GitHub)" <gi...@apache.org>.
Omega359 commented on PR #26293:
URL: https://github.com/apache/datafusion/pull/26293#issuecomment-6170826190
fingers crossed
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For additional commands, e-mail: github-help@datafusion.apache.org
Re: [PR] ci: raise the merge queue status check timeout to 360 minutes [datafusion]
Posted by "alamb (via GitHub)" <gi...@apache.org>.
alamb commented on PR #26293:
URL: https://github.com/apache/datafusion/pull/26293#issuecomment-6172641443
Sorry -- forgot to post my comments
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: github-unsubscribe@datafusion.apache.org
For additional commands, e-mail: github-help@datafusion.apache.org