Skip to content

Conversation

@jedcunningham
Copy link
Member

That import was removed in #44839, but #44710 wasn't up-to-date with main so static checks there didn't fail. This simply adds it back.

That import was removed in apache#44839, but apache#44710 wasn't up-to-date with main so
static checks there didn't fail. This simply adds it back.
@boring-cyborg boring-cyborg bot added the area:Executors-core LocalExecutor & SequentialExecutor label Dec 14, 2024
@jedcunningham jedcunningham merged commit 23f59fe into apache:main Dec 14, 2024
49 checks passed
@jedcunningham jedcunningham deleted the fix_ruff branch December 14, 2024 00:28
@o-nikolas
Copy link
Contributor

Thanks @jedcunningham
I'm not sure how that happened or wasn't detected. Seems like a test should have failed but didn't? Are we missing coverage?

@jedcunningham
Copy link
Member Author

No worries, this is just a standard "branch wasn't up to date with main, and tests run from the branch" scenario. Nothing missing really, just every so often we will have to fix these types of things.

@potiuk
Copy link
Member

potiuk commented Dec 17, 2024

Cross-merging PRs. yeah.

And actually yes we could do something about it - that could go away if we had the possibility of using "Merge Queue" functionality: https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue

The merge queue functionality works in the way, that instead of merging, committer adds PR to merge queue, and they are run in sequence - automatically rebasing them after the previously merged PR is merged - and only actually merging the PR when that "queued" PR had succeded again after rebase.

So far it was blocked as INFRA tooling is unable to retrieve "merger identity" for necessary ICLA "audit logs" when merge queue is used. But @davidarthur from Kafka team run a sandbox environment https://issues.apache.org/jira/browse/INFRA-25932 where he had shown how it is possible - so now it hangs a bit on INFRA making a decision whether to invest in it, implement missing piece and enable it.

If people here would like to comment on ths INFRA ticket and encourage it, having the possibility of using Merge Queues could help us to avoid this kind of issues, without impacting the velocity of merges.

@o-nikolas
Copy link
Contributor

That sounds like an awesome mechanism @potiuk I added a +1 to the ticket (I didn't want to pollute the comment stream where details are being hashed out).

@ashb
Copy link
Member

ashb commented Dec 17, 2024

Merge queue are a double edge sword, especially with our full test matrix taking ~1 hour and our sometimes flakey tests and it would greatly limit the number of PRs we could merge.

@potiuk
Copy link
Member

potiuk commented Dec 17, 2024

Merge queue are a double edge sword, especially with our full test matrix taking ~1 hour and our sometimes flakey tests and it would greatly limit the number of PRs we could merge.

Not when we go back and have ARC enabled, our tests elapsed time will go back to 20 minutes, and we already have done pretty damn good job (and continue doing so) on battling flaky tests. With our team effort we already have sometimes days without flaky tests, and yes while I would not want to use merge queues two months ago, I think we are pretty much ready to get it and get it much more stable (especially after we bring back 16 processor machines in our S3 to complete our tests 4 and sometimes even 8 times faster than the current builds. CC: @hussein-awala :D

@potiuk
Copy link
Member

potiuk commented Dec 17, 2024

PLus merge queue will STILL use the selective checks optimizations - that is not going to change - so most of the PRS will be done in 10 minutes even without ARC (and maybe less than 4-5 minutes with ARC).

@o-nikolas
Copy link
Contributor

I also think consistency is very important and worth paying a time cost for. Something could have been dropped that was harder to detect except in narrow runtime circumstances.

got686-yandex pushed a commit to got686-yandex/airflow that referenced this pull request Jan 30, 2025
That import was removed in apache#44839, but apache#44710 wasn't up-to-date with main so
static checks there didn't fail. This simply adds it back.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area:Executors-core LocalExecutor & SequentialExecutor

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants