Merge branch 'main' into malformat

Author: bzwei

src/aap_eda/services/activation/engine/podman.py

@@ -100,6 +100,11 @@ def cleanup(self, container_id: str, log_handler: LogHandler) -> None:
         # ContainerCleanupError handled by the manager
         except APIError as e:
             raise exceptions.ContainerCleanupError(str(e)) from e
+        finally:
+            # Ensure volumes are purged due to a bug in podman
+            # ref: https://github.com/containers/podman-py/issues/328
+            pruned_volumes = self.client.volumes.prune()
+            LOGGER.info(f"Pruned volumes: {pruned_volumes}")
 
     def _image_exists(self, image_url: str) -> bool:
         try:

src/aap_eda/services/activation/manager.py

@@ -1075,9 +1075,13 @@ def _get_container_request(self) -> ContainerRequest:
     @staticmethod
     def check_new_process_allowed(parent_type: str, parent_id: int) -> bool:
         """Check if a new process is allowed."""
+        if settings.MAX_RUNNING_ACTIVATIONS < 0:
+            return True
+
         num_running_processes = models.RulebookProcess.objects.filter(
             status__in=[ActivationStatus.RUNNING, ActivationStatus.STARTING],
         ).count()
+
         if num_running_processes >= settings.MAX_RUNNING_ACTIVATIONS:
             LOGGER.info(
                 "No capacity to start a new rulebook process. "

src/aap_eda/settings/default.py

@@ -447,6 +447,8 @@ def _get_secret_key() -> str:
 ACTIVATION_MAX_RESTARTS_ON_FAILURE = int(
     settings.get("ACTIVATION_MAX_RESTARTS_ON_FAILURE", 5)
 )
+
+# -1 means no limit
 MAX_RUNNING_ACTIVATIONS = int(settings.get("MAX_RUNNING_ACTIVATIONS", 5))
 
 # ---------------------------------------------------------