manager: remove also taken resources that fail livecheck

Fixes: fedora-copr/copr#2490
praiskup · Jan 23, 2023 · 1d774dc · 1d774dc
1 parent 43fdaee
commit 1d774dc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/resallocserver/logic.py b/resallocserver/logic.py
@@ -133,8 +133,6 @@ def check_failure_candidates(self):
         """
         return (
             self.up()
-            # isn't it still used?
-            .filter(models.Resource.ticket_id.is_(None))
             .filter(models.Resource.check_failed_count > 0)
         )
 

diff --git a/resallocserver/manager.py b/resallocserver/manager.py
@@ -653,7 +653,8 @@ def _request_resource_removal(self):
                     app.log.warning(
                         "Requesting %s removal for continuous failures",
                         res.name)
-                    res.state = RState.DELETE_REQUEST
+                    # Not just DELETE_REQUEST, we need to mark the ticket FAILED
+                    QResources(session).kill(res.id)
                     continue
 
             for res in qres.clean_candidates():