(tooling-trusted-releases) 01/01: Don't show podlings on attic card, fix CPU time limit for long tasks

[ar...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

alitheg pushed a commit to branch arm
in repository https://gitbox.apache.org/repos/asf/tooling-trusted-releases.git

commit ffca3bf6d2dbad7cfe53070af82d6f8eec043021
Author: Alastair McFarlane <ar...@apache.org>
AuthorDate: Thu Sep 10 16:17:50 2026 +0100

    Don't show podlings on attic card, fix CPU time limit for long tasks
---
 atr/get/release.py | 4 +++-
 atr/worker.py      | 9 +++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/atr/get/release.py b/atr/get/release.py
index e39b25f3..f59b0e81 100644
--- a/atr/get/release.py
+++ b/atr/get/release.py
@@ -149,7 +149,9 @@ def _committee_release_catalog(
             # Nothing to group it under here, so skip it. Shouldn't happen in practice.
             continue
         # A retired PMC (kept its own key) or an Attic-homed project lands on the Attic card
-        if (attic is not None) and (committee.is_archived or (committee.key == _ATTIC_COMMITTEE_KEY)):
+        if (attic is not None and not committee.is_podling) and (
+            committee.is_archived or (committee.key == _ATTIC_COMMITTEE_KEY)
+        ):
             key, card = _ATTIC_COMMITTEE_KEY, attic
         else:
             key, card = committee.key, committee
diff --git a/atr/worker.py b/atr/worker.py
index 3011fe54..65821ac5 100644
--- a/atr/worker.py
+++ b/atr/worker.py
@@ -468,11 +468,12 @@ async def _worker_loop_run() -> None:
         log.clear_context()
         try:
             log.add_context(worker_pid=os.getpid())
-            task = await _task_next_claim()
-            if task:
-                task_id, task_type, task_args, asf_uid = task
+            claimed = await _task_next_claim()
+            if claimed:
+                task_id, task_type, task_args, asf_uid = claimed
                 log.add_context(task_id=task_id, task_type=task_type, asf_uid=asf_uid)
-                util.cpu_limit_arm(_CPU_LIMIT_SECONDS)
+                cpu_limit = max(int(_CPU_LIMIT_SECONDS), task.TASK_TYPE_TIMEOUT_SECONDS.get(sql.TaskType(task_type), 0))
+                util.cpu_limit_arm(cpu_limit)
                 await _task_process(task_id, task_type, task_args, asf_uid)
                 processed += 1
                 # Only process max_to_process tasks and then exit


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tooling.apache.org
For additional commands, e-mail: commits-help@tooling.apache.org