Fix KEDA Query to Use executor Field Instead of queue for Multiple Executors #52840
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
HsiuChuanHsu
requested review from
dstandish,
hussein-awala and
jedcunningham
as code owners
romsharon98
approved these changes
Jul 8, 2025
Contributor
|
Tests need to be fixed |
HsiuChuanHsu
requested review from
Fokko,
amoghrajesh,
ashb,
bbovenzi,
bolkedebruin,
bugraoz93,
eladkal,
ephraimbuddy,
gopidesupavan,
jason810496,
josh-fell,
jscheffl,
kaxil,
mik-laj,
mobuchowski,
o-nikolas,
pierrejeambrun,
potiuk,
ryanahamilton,
shahar1,
shubhamraj-git,
uranusjr and
vincbeck
as code owners
amoghrajesh
approved these changes
Jul 11, 2025
bugraoz93
approved these changes
Jul 11, 2025
Contributor
bugraoz93
left a comment
bugraoz93
left a comment
There was a problem hiding this comment.
Thanks for the changes! Could you please rebase it before merging it? The PR has 137 commits
Contributor
|
I think you are merging the changes. You need to rebase from master and force push changes to your branch. |
- Update workers.keda.query in values.yaml to check executor attribute
- Modified the KEDA autoscaling query in values.schema.json to handle KubernetesExecutor separately from CeleryKubernetesExecutor, ensuring tasks with KubernetesExecutor are filtered by executor type instead of queue name. - Updated the corresponding logic in test_keda.py to reflect the new query structure, improving test accuracy for KubernetesExecutor scenarios.
HsiuChuanHsu
force-pushed
the
bug/keda-query-executor-mismatch
branch
from
b749ba9 to
15b0e67
Compare
Contributor
Author
|
I think I changed it correctly this time! Thanks a lot for the help! |
Contributor
|
This is it, thanks! :) |
|
Awesome work, congrats on your first merged pull request! You are invited to check our Issue Tracker for additional contributions. |
karenbraganz
pushed a commit
to karenbraganz/airflow
that referenced
this pull request
Jul 18, 2025
96 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description:
When multiple executors (e.g.,
CeleryExecutor,KubernetesExecutor) are configured, the worker defaultKEDAquery uses thequeuecolumn in the Airflow metadata database to determine Celery worker scaling.However, task routing in Airflow is based on the
executorattribute, notqueue. This causes Celery workers to scale up unnecessarily for tasks explicitly configured withexecutor='KubernetesExecutor'but using thedefaultqueueChanges:
This PR updates the KEDA query logic in
values.yamlto correctly filter tasks based on the executor field when multipleexecutorsare configured:CeleryKubernetesExecutor, the existing logic is retained, usingqueue != '{{ .Values.config.celery_kubernetes_executor.kubernetes_queue }}'.KubernetesExecutor(alone or withCeleryExecutor), the query is updated to useexecutor != 'KubernetesExecutor'ensuring tasks assigned toKubernetesExecutornot trigger Celery worker scaling.Testing Steps
KEDAenabled and multiple executors:KubernetesExecutorandqueue='default'executor='KubernetesExecutor'Additional Notes:
Related Issues:
Closes: #49001
^ Add meaningful description above
Read the Pull Request Guidelines for more information.
In case of fundamental code changes, an Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
In case of backwards incompatible changes please leave a note in a newsfragment file, named
{pr_number}.significant.rstor{issue_number}.significant.rst, in airflow-core/newsfragments.