Changeset 244284 in webkit

Timestamp:

Apr 15, 2019 1:18:48 PM (5 years ago)

Author:

aakash_jain@apple.com

Message:

[ews-app] status-bubble should display position in queue
​https://bugs.webkit.org/show_bug.cgi?id=196607

Reviewed by Lucas Forschler.

• BuildSlaveSupport/ews-app/ews/views/statusbubble.py:

(StatusBubble._build_bubble):
(StatusBubble._queue_position): Method to calculate patch's position in queue.

Location:

trunk/Tools

Files:

• BuildSlaveSupport/ews-app/ews/views/statusbubble.py (modified) (3 diffs)
• ChangeLog (modified) (1 diff)

trunk/Tools/BuildSlaveSupport/ews-app/ews/views/statusbubble.py

@@ -28 +28 @@
 from django.http import HttpResponse
 from django.shortcuts import render
+from django.utils import timezone
 from django.views import View
 from django.views.decorators.clickjacking import xframe_options_exempt
 from ews.common.buildbot import Buildbot
+from ews.models.build import Build
 from ews.models.patch import Patch
 import ews.config as config
@@ -59 +61 @@
         if not build:
             bubble['state'] = 'none'
-            bubble['details_message'] = 'Waiting in queue, processing has not started yet.'
+            queue_position = self._queue_position(patch, queue, self._get_parent_queue(queue))
+            bubble['queue_position'] = queue_position
+            bubble['details_message'] = 'Waiting in queue, processing has not started yet.\n\nPosition in queue: {}'.format(queue_position)
             return bubble
 
@@ -168 +172 @@
         return queue in StatusBubble.ENABLED_QUEUES
 
+    def _queue_position(self, patch, queue, parent_queue=None):
+        # FIXME: Handle retried builds and cancelled build-requests as well.
+        DAYS_TO_CHECK = 3
+        from_timestamp = timezone.now() - datetime.timedelta(days=DAYS_TO_CHECK)
+
+        previously_sent_patches = set(Patch.objects
+                                          .filter(modified__gte=from_timestamp)
+                                          .filter(sent_to_buildbot=True)
+                                          .filter(obsolete=False)
+                                          .filter(modified__lt=patch.modified))
+        if parent_queue:
+            recent_builds_parent_queue = Build.objects \
+                                             .filter(modified__gte=from_timestamp) \
+                                             .filter(builder_display_name=parent_queue)
+            processed_patches_parent_queue = set([build.patch for build in recent_builds_parent_queue])
+            return len(previously_sent_patches - processed_patches_parent_queue) + 1
+
+        recent_builds = Build.objects \
+                            .filter(modified__gte=from_timestamp) \
+                            .filter(builder_display_name=queue)
+        processed_patches = set([build.patch for build in recent_builds])
+        return len(previously_sent_patches - processed_patches) + 1
+
     def _build_bubbles_for_patch(self, patch):
         show_submit_to_ews = True

trunk/Tools/ChangeLog

@@ +1 @@
+2019-04-15  Aakash Jain  <aakash_jain@apple.com>
+
+        [ews-app] status-bubble should display position in queue
+        https://bugs.webkit.org/show_bug.cgi?id=196607
+
+        Reviewed by Lucas Forschler.
+
+        * BuildSlaveSupport/ews-app/ews/views/statusbubble.py:
+        (StatusBubble._build_bubble):
+        (StatusBubble._queue_position): Method to calculate patch's position in queue.
+
 2019-04-15  Aakash Jain  <aakash_jain@apple.com>