Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 2 additions & 10 deletions src/taskgraph/actions/cancel.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@

import logging

import requests

from taskcluster import TaskclusterRestFailure
from taskgraph.util.taskcluster import cancel_task

Expand All @@ -28,14 +26,8 @@ def cancel_action(parameters, graph_config, input, task_group_id, task_id):
# only cancel tasks with the level-specific schedulerId.
try:
cancel_task(task_id)
except (requests.HTTPError, TaskclusterRestFailure) as e:
status_code = None
if isinstance(e, requests.HTTPError):
status_code = e.response.status_code if e.response else None
elif isinstance(e, TaskclusterRestFailure):
status_code = e.status_code

if status_code == 409:
except TaskclusterRestFailure as e:
if e.status_code == 409:
# A 409 response indicates that this task is past its deadline. It
# cannot be cancelled at this time, but it's also not running
# anymore, so we can ignore this error.
Expand Down
12 changes: 2 additions & 10 deletions src/taskgraph/actions/cancel_all.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
import os
from concurrent import futures

import requests

from taskcluster import TaskclusterRestFailure
from taskgraph.util.taskcluster import (
CONCURRENCY,
Expand Down Expand Up @@ -37,14 +35,8 @@ def do_cancel_task(task_id):
logger.info(f"Cancelling task {task_id}")
try:
cancel_task(task_id)
except (requests.HTTPError, TaskclusterRestFailure) as e:
status_code = None
if isinstance(e, requests.HTTPError):
status_code = e.response.status_code if e.response else None
elif isinstance(e, TaskclusterRestFailure):
status_code = e.status_code

if status_code == 409:
except TaskclusterRestFailure as e:
if e.status_code == 409:
# A 409 response indicates that this task is past its deadline. It
# cannot be cancelled at this time, but it's also not running
# anymore, so we can ignore this error.
Expand Down
10 changes: 3 additions & 7 deletions src/taskgraph/util/taskcluster.py
Original file line number Diff line number Diff line change
Expand Up @@ -467,15 +467,11 @@ def get_ancestors(task_ids: Union[list[str], str]) -> dict[str, str]:
for task_id in task_ids:
try:
task_def = get_task_definition(task_id)
except (requests.HTTPError, taskcluster.TaskclusterRestFailure) as e:
except taskcluster.TaskclusterRestFailure as e:
# Task has most likely expired, which means it's no longer a
# dependency for the purposes of this function.
if isinstance(e, requests.HTTPError):
if e.response and e.response.status_code == 404:
continue
elif isinstance(e, taskcluster.TaskclusterRestFailure):
if e.status_code == 404:
continue
if e.status_code == 404:
continue
raise e

dependencies = task_def.get("dependencies", [])
Expand Down
Loading