External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-02 01:08:48 -03:30
Code Issues Packages Projects Releases Wiki Activity

correct filter events on the migration event horizon

Browse Source 
events that existed *prior* to the partition migration will have
`job_created=1970-01-01` auto-applied at migration time; as such,
queries for these events e.g., /api/v2/job/N/job_events/
use 1970-01-01 in related event searche

events created *after* the partition migration (net-new playbook runs
will have `job_created` values that *exactly match* the related
`UnifiedJob.created` field.
This commit is contained in:
Ryan Petrello
2021-02-25 17:51:29 -05:00
committed by Jim Ladd
parent 1e45e2ab9b
commit 08b96a0bd7
4 changed files with 41 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
awx/api/views/__init__.py
View File

@@ -175,9 +175,6 @@ from awx.api.views.root import ( # noqa
from awx.api.views.webhooks import WebhookKeyView, GithubWebhookReceiver, GitlabWebhookReceiver # noqa
EPOCH = datetime.datetime.utcfromtimestamp(0)
logger = logging.getLogger('awx.api.views')
@@ -889,7 +886,7 @@ class ProjectUpdateEventsList(SubListAPIView):
def get_queryset(self):
return super(ProjectUpdateEventsList, self).get_queryset().filter(
job_created__in=(self.get_parent_object().created, EPOCH)
job_created=self.get_parent_object().created_or_epoch
)
class SystemJobEventsList(SubListAPIView):
@@ -907,7 +904,7 @@ class SystemJobEventsList(SubListAPIView):
def get_queryset(self):
return super(SystemJobEventsList, self).get_queryset().filter(
job_created__in=(self.get_parent_object().created, EPOCH)
job_created=self.get_parent_object().created_or_epoch
)
class ProjectUpdateCancel(RetrieveAPIView):
@@ -3828,7 +3825,7 @@ class JobJobEventsList(BaseJobEventsList):
job = self.get_parent_object()
self.check_parent_access(job)
qs = job.job_events.filter(
job_created__in=(job.created, EPOCH)
job_created=self.get_parent_object().created_or_epoch
).select_related('host').order_by('start_line')
return qs.all()
@@ -4011,7 +4008,7 @@ class BaseAdHocCommandEventsList(NoTruncateMixin, SubListAPIView):
def get_queryset(self):
return super(BaseAdHocCommandEventsList, self).get_queryset().filter(
job_created__in=(self.get_parent_object().created, EPOCH)
job_created=self.get_parent_object().created_or_epoch
)

4
awx/api/views/inventory.py
View File

@@ -41,8 +41,6 @@ from awx.api.views.mixin import RelatedJobsPreventDeleteMixin, ControlledByScmMi
logger = logging.getLogger('awx.api.views.organization')
EPOCH = datetime.datetime.utcfromtimestamp(0)
class InventoryUpdateEventsList(SubListAPIView):
@@ -55,7 +53,7 @@ class InventoryUpdateEventsList(SubListAPIView):
def get_queryset(self):
return super(InventoryUpdateEventsList, self).get_queryset().filter(
job_created__in=(self.get_parent_object().created, EPOCH)
job_created=self.get_parent_object().created_or_epoch
)
def finalize_response(self, request, response, *args, **kwargs):