Skip to content

Remove webserver try_number adjustment #39623

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

Merged
dstandish merged 2 commits into from
May 14, 2024
Merged

Remove webserver try_number adjustment #39623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf57c13
Remove webserver try_number adjustment
dstandish May 14, 2024
fb53318
fix test
dstandish May 14, 2024
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
8 changes: 1 addition & 7 deletions airflow/www/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,6 @@ def get_instance_with_map(task_instance, session):
return get_mapped_summary(task_instance, mapped_instances)


def get_try_count(try_number: int, state: State):
if state in (TaskInstanceState.DEFERRED, TaskInstanceState.UP_FOR_RESCHEDULE):
return try_number + 1
return try_number


priority: list[None | TaskInstanceState] = [
TaskInstanceState.FAILED,
TaskInstanceState.UPSTREAM_FAILED,
Expand Down Expand Up @@ -147,7 +141,7 @@ def get_mapped_summary(parent_instance, task_instances):
"start_date": group_start_date,
"end_date": group_end_date,
"mapped_states": mapped_states,
"try_number": get_try_count(parent_instance.try_number, parent_instance.state),
"try_number": parent_instance.try_number,
"execution_date": parent_instance.execution_date,
}

Expand Down
4 changes: 2 additions & 2 deletions airflow/www/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ def set_overall_state(record):
"queued_dttm": task_instance.queued_dttm,
"start_date": task_instance.start_date,
"end_date": task_instance.end_date,
"try_number": wwwutils.get_try_count(task_instance.try_number, task_instance.state),
"try_number": task_instance.try_number,
"note": task_instance.note,
}
for task_instance in grouped_tis[item.task_id]
Expand Down Expand Up @@ -1687,7 +1687,7 @@ def log(self, session: Session = NEW_SESSION):

num_logs = 0
if ti is not None:
num_logs = wwwutils.get_try_count(ti.try_number, ti.state)
num_logs = ti.try_number
logs = [""] * num_logs
root = request.args.get("root", "")
return self.render_template(
Expand Down
4 changes: 2 additions & 2 deletions tests/www/views/test_views_log.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,8 @@ def log_admin_client(log_app):
[
(None, 0, 0),
(TaskInstanceState.UP_FOR_RETRY, 2, 2),
(TaskInstanceState.UP_FOR_RESCHEDULE, 0, 1),
(TaskInstanceState.UP_FOR_RESCHEDULE, 1, 2),
(TaskInstanceState.UP_FOR_RESCHEDULE, 0, 0),
(TaskInstanceState.UP_FOR_RESCHEDULE, 1, 1),
(TaskInstanceState.RUNNING, 1, 1),
(TaskInstanceState.SUCCESS, 1, 1),
(TaskInstanceState.FAILED, 3, 3),
Expand Down