backend: per-arch/per-owner limit fixed

Prior this patch, the per-arch limit was applied to all architectures. Fixes: #3574
fedora-copr · Jan 6, 2025 · 9d0d6f3 · 9d0d6f3
1 parent fbe8a68
commit 9d0d6f3
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/backend/copr_backend/rpm_builds.py b/backend/copr_backend/rpm_builds.py
@@ -143,8 +143,15 @@ class ArchitectureUserWorkerLimit(HashWorkerLimit):
     Copr owner (user or group).
     """
     def __init__(self, architecture, limit):
+        def _hasher(job):
+            if job.requested_arch != architecture:
+                # When _hasher(job) returns None, no limit applies, see
+                # HashWorkerLimit._groups.add() for more info.
+                return None
+            return f"{job.requested_arch}_{job.owner}"
+
         super().__init__(
-            lambda x: f"{x.requested_arch}_{x.owner}",
+            _hasher,
             limit,
             name=f"arch_{architecture}_owner",
         )

diff --git a/backend/tests/test_worker_limits.py b/backend/tests/test_worker_limits.py
@@ -40,6 +40,12 @@
     "project_owner": "bedrich",
     "sandbox": "sb2",
     "tags": ["special_requirement"],
+}, {
+    "build_id": 4,
+    "task_id": "7-fedora-31-aarch64",
+    "chroot": "fedora-31-aarch64",
+    "project_owner": "bedrich",
+    "sandbox": "sb2",
 }]
 
 class _QT(BackendQueueTask):
@@ -128,14 +134,15 @@ def test_worker_limit_info():
             limit.worker_added("w:" + str(task.id), task)
     assert ["limit info: " + limit.info() for limit in limits] == [
         "limit info: Unnamed 'PredicateWorkerLimit' limit, matching: w:7, "
-        'w:7-fedora-rawhide-x86_64, w:7-fedora-32-x86_64, w:7-fedora-31-x86_64',
+        'w:7-fedora-rawhide-x86_64, w:7-fedora-32-x86_64, w:7-fedora-31-x86_64, '
+        'w:7-fedora-31-aarch64',
         "limit info: 'allmatch', matching: w:7, w:7-fedora-rawhide-x86_64, "
-        'w:7-fedora-32-x86_64, w:7-fedora-31-x86_64',
-        "limit info: Unnamed 'HashWorkerLimit' limit, counter: cecil=2, bedrich=2",
-        "limit info: 'sandbox', counter: sb1=1, sb2=2",
+        'w:7-fedora-32-x86_64, w:7-fedora-31-x86_64, w:7-fedora-31-aarch64',
+        "limit info: Unnamed 'HashWorkerLimit' limit, counter: cecil=2, bedrich=3",
+        "limit info: 'sandbox', counter: sb1=1, sb2=3",
         "limit info: 'arch_x86_64', matching: w:7-fedora-rawhide-x86_64, w:7-fedora-32-x86_64, w:7-fedora-31-x86_64",
-        "limit info: 'arch_aarch64'",
-        "limit info: 'arch_aarch64_owner', counter: None_cecil=1, x86_64_cecil=1, x86_64_bedrich=2",
+        "limit info: 'arch_aarch64', matching: w:7-fedora-31-aarch64",
+        "limit info: 'arch_aarch64_owner', counter: aarch64_bedrich=1",
         "limit info: 'tag_special_requirement', matching: w:7-fedora-31-x86_64",
     ]