Skip to content

Ensure only one dag entry is displayed in dags list output case of dags with multiple serialized dags. #60637

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tirkarthi wants to merge 1 commit into from
Closed

Ensure only one dag entry is displayed in dags list output case of dags with multiple serialized dags. #60637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion airflow-core/src/airflow/cli/commands/dag_command.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ def dag_list_dags(args, session: Session = NEW_SESSION) -> None:
dags_list.extend(list(dagbag.dags.values()))
dagbag_import_errors += len(dagbag.import_errors)
else:
dags_list.extend(cast("DAG", sm.dag) for sm in session.scalars(select(SerializedDagModel)))
dags_list.extend(cast("DAG", dag) for dag in SerializedDagModel.read_all_dags().values())
pie_stmt = select(func.count()).select_from(ParseImportError)
if args.bundle_name:
pie_stmt = pie_stmt.where(ParseImportError.bundle_name.in_(args.bundle_name))
Expand Down
28 changes: 28 additions & 0 deletions airflow-core/tests/unit/cli/commands/test_dag_command.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,10 @@
from airflow.dag_processing.dagbag import DagBag, sync_bag_to_db
from airflow.exceptions import AirflowException
from airflow.models import DagModel, DagRun
from airflow.models.dag_version import DagVersion
from airflow.models.dagbag import DBDagBag
from airflow.models.serialized_dag import SerializedDagModel
from airflow.providers.standard.operators.empty import EmptyOperator
from airflow.providers.standard.triggers.temporal import DateTimeTrigger, TimeDeltaTrigger
from airflow.sdk import BaseOperator, task
from airflow.sdk.definitions.dag import _run_inline_trigger
Expand Down Expand Up @@ -968,6 +970,32 @@ def test_get_dag_excludes_examples_with_bundle(self, configure_testing_dag_bundl
dag = get_bagged_dag(bundle_names=["testing"], dag_id="test_sensor")
assert dag.dag_id == "test_sensor"

@conf_vars({("core", "load_examples"): "false"})
def test_multiple_serialized_dags_list(self, dag_maker, stdout_capture, session):
"""Test that only one dag entry is displayed in case of dag with multiple serialized dags."""

clear_db_dags()

with dag_maker("test1") as dag:
EmptyOperator(task_id="task1")
sync_dag_to_db(dag)

with dag_maker("test1") as dag2:
EmptyOperator(task_id="task1")
EmptyOperator(task_id="task2")
sync_dag_to_db(dag2)

latest_version = DagVersion.get_latest_version(dag.dag_id)
assert latest_version.version_number == 2
assert session.scalar(select(func.count()).where(DagVersion.dag_id == dag.dag_id)) == 2

list_dags_args = self.parser.parse_args(["dags", "list", "--columns", "dag_id", "--output", "json"])

with stdout_capture as temp_stdout:
dag_command.dag_list_dags(list_dags_args)
out = temp_stdout.getvalue()
assert json.loads(out) == [{"dag_id": "test1"}]


class TestCliDagsReserialize:
parser = cli_parser.get_parser()
Expand Down