uranusjr commented on code in PR #42175:
URL: https://github.com/apache/airflow/pull/42175#discussion_r1755472693
##########
airflow/providers/cncf/kubernetes/executors/kubernetes_executor.py:
##########
@@ -197,13 +199,25 @@ def clear_not_launched_queued_tasks(self, session:
Session = NEW_SESSION) -> Non
assert self.kube_client
from airflow.models.taskinstance import TaskInstance
+ default_executor = str(ExecutorLoader.get_default_executor_name())
+
with
Stats.timer("kubernetes_executor.clear_not_launched_queued_tasks.duration"):
self.log.debug("Clearing tasks that have not been launched")
- query = select(TaskInstance).where(
- TaskInstance.state == TaskInstanceState.QUEUED,
TaskInstance.queued_by_job_id == self.job_id
- )
+
+ criteria = [
+ TaskInstance.state == TaskInstanceState.QUEUED,
+ TaskInstance.queued_by_job_id == self.job_id,
+ ]
if self.kubernetes_queue:
- query = query.where(TaskInstance.queue ==
self.kubernetes_queue)
+ criteria.append(TaskInstance.queue == self.kubernetes_queue)
+ elif KUBERNETES_EXECUTOR == default_executor:
+ criteria.append(
+ or_(TaskInstance.executor == KUBERNETES_EXECUTOR,
TaskInstance.executor.is_(None))
+ )
+ else:
+ criteria.append(TaskInstance.executor == KUBERNETES_EXECUTOR)
+ query = select(TaskInstance).where(*criteria)
Review Comment:
I’d just do
```python
query = select(TaskInstance).where(
TaskInstance.state == TaskInstanceState.QUEUED,
TaskInstance.queued_by_job_id == self.job_id,
)
if self.kubernetes_queue:
query = query.where(TaskInstance.queue == self.kubernetes_queue)
if KUBERNETES_EXECUTOR == default_executor:
query = query.where(
or_(
TaskInstance.executor == KUBERNETES_EXECUTOR,
TaskInstance.executor.is_(None),
),
)
else:
query = query.where(TaskInstance.executor == KUBERNETES_EXECUTOR)
```
Easier to read IMO.
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
