Skip to content

Commit

Permalink
Fix slow DAG deletion due to missing dag_id index for job table (#…
Browse files Browse the repository at this point in the history
…20282)

Fixes #20249

(cherry picked from commit ac9f29d)
  • Loading branch information
kushsharma authored and jedcunningham committed Feb 17, 2022
1 parent dd0a3a3 commit 436f452
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 1 deletion.
1 change: 1 addition & 0 deletions airflow/jobs/base_job.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ class BaseJob(Base, LoggingMixin):
__table_args__ = (
Index('job_type_heart', job_type, latest_heartbeat),
Index('idx_job_state_heartbeat', state, latest_heartbeat),
Index('idx_job_dag_id', dag_id),
)

task_instances_enqueued = relationship(
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

"""adding index for dag_id in job
Revision ID: 587bdf053233
Revises: f9da662e7089
Create Date: 2021-12-14 10:20:12.482940
"""

from alembic import op

# revision identifiers, used by Alembic.
revision = '587bdf053233'
down_revision = 'f9da662e7089'
branch_labels = None
depends_on = None


def upgrade():
"""Apply adding index for dag_id in job"""
op.create_index('idx_job_dag_id', 'job', ['dag_id'], unique=False)


def downgrade():
"""Unapply adding index for dag_id in job"""
op.drop_index('idx_job_dag_id', table_name='job')
4 changes: 3 additions & 1 deletion docs/apache-airflow/migrations-ref.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ Here's the list of all the Database Migrations that are executed via when you ru
+--------------------------------+------------------+-----------------+---------------------------------------------------------------------------------------+
| Revision ID | Revises ID | Airflow Version | Description |
+--------------------------------+------------------+-----------------+---------------------------------------------------------------------------------------+
| ``c381b21cb7e4`` (head) | ``be2bfac3da23`` | ``2.2.4`` | Create a ``session`` table to store web session data |
| ``587bdf053233`` (head) | ``f9da662e7089`` | ``2.3.0`` | Add index for ``dag_id`` column in ``job`` table. |
+--------------------------------+------------------+-----------------+---------------------------------------------------------------------------------------+
| ``c381b21cb7e4`` | ``be2bfac3da23`` | ``2.2.4`` | Create a ``session`` table to store web session data |
+--------------------------------+------------------+-----------------+---------------------------------------------------------------------------------------+
| ``be2bfac3da23`` | ``7b2661a43ba3`` | ``2.2.3`` | Add has_import_errors column to DagModel |
+--------------------------------+------------------+-----------------+---------------------------------------------------------------------------------------+
Expand Down

0 comments on commit 436f452

Please sign in to comment.