From e1a9df21da17d34f2f9cff67e1ea965e57afd2c2 Mon Sep 17 00:00:00 2001 From: Parker Berberian Date: Wed, 2 Jan 2019 13:59:39 -0500 Subject: Improve cleanup of hosts after booking Previously, the database query was not reliably detecting hosts which were to be released and made available for new bookings. This should now take all bookings that are over and have been cleaned by the lab, and make the hosts available for reuse. Change-Id: I040c2e02ac48d7bfde3fc1cf6bac4e59a48c8933 Signed-off-by: Parker Berberian --- dashboard/src/dashboard/tasks.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dashboard/src/dashboard/tasks.py b/dashboard/src/dashboard/tasks.py index b1d97b7..67a06fd 100644 --- a/dashboard/src/dashboard/tasks.py +++ b/dashboard/src/dashboard/tasks.py @@ -14,7 +14,7 @@ from django.utils import timezone from django.db.models import Q from booking.models import Booking from notifier.manager import NotificationHandler -from api.models import JobStatus, SoftwareRelation, HostHardwareRelation, HostNetworkRelation, AccessRelation +from api.models import Job, JobStatus, SoftwareRelation, HostHardwareRelation, HostNetworkRelation, AccessRelation from resource_inventory.resource_manager import ResourceManager @@ -92,12 +92,11 @@ def free_hosts(): """ gets all hosts from the database that need to be freed and frees them """ - networks = ~Q(~Q(job__hostnetworkrelation__status=200)) - hardware = ~Q(~Q(job__hosthardwarerelation__status=200)) + undone_jobs = Job.objects.filter(hostnetworkrelation__status__ne=200, hosthardwarerelation__status__ne=200) - bookings = Booking.objects.filter( - networks, - hardware, + bookings = Booking.objects.exclude( + job_in=undone_jobs + ).filter( end__lt=timezone.now(), job__complete=True, resource__isnull=False -- cgit 1.2.3-korg