Changeset 162358 in webkit

Timestamp:

Jan 20, 2014, 10:37:49 AM (11 years ago)

Author:

ap@apple.com

Message:

EWS should provide better information to Dashboard via JSON
​https://bugs.webkit.org/show_bug.cgi?id=127265

Reviewed by Ryosuke Niwa.

• QueueStatusServer/app.yaml: Updated version.

• QueueStatusServer/main.py:
• QueueStatusServer/handlers/queuelengthjson.py:

Added a way to cheaply get only the queue length, which is all the dashboard
needs unless a popover is opened.

• QueueStatusServer/handlers/queuestatusjson.py: Updated to return more information

that we will need. Changed some field names to be more meaningful. Fixed bot listing
to understand that a bot can be reprurposed and used in a different queue.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• QueueStatusServer/app.yaml (modified) (1 diff)
• QueueStatusServer/handlers/queuelengthjson.py (added)
• QueueStatusServer/handlers/queuestatusjson.py (modified) (5 diffs)
• QueueStatusServer/main.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2014-01-20  Alexey Proskuryakov  <ap@apple.com>
+
+        EWS should provide better information to Dashboard via JSON
+        https://bugs.webkit.org/show_bug.cgi?id=127265
+
+        Reviewed by Ryosuke Niwa.
+
+        * QueueStatusServer/app.yaml: Updated version.
+
+        * QueueStatusServer/main.py:
+        * QueueStatusServer/handlers/queuelengthjson.py:
+        Added a way to cheaply get only the queue length, which is all the dashboard
+        needs unless a popover is opened.
+
+        * QueueStatusServer/handlers/queuestatusjson.py: Updated to return more information
+        that we will need. Changed some field names to be more meaningful. Fixed bot listing
+        to understand that a bot can be reprurposed and used in a different queue.
+
 2014-01-20  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Tools/QueueStatusServer/app.yaml

@@ -1 +1 @@
 application: webkit-queues
-version: 162287 # Bugzilla bug ID of last major change
+version: 162358 # Bugzilla bug ID of last major change
 runtime: python
 api_version: 1

trunk/Tools/QueueStatusServer/handlers/queuestatusjson.py

@@ -1 @@
-# Copyright (C) 2013 Apple. All rights reserved.
+# Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -46 +46 @@
         rows = []
         for item_id in queued_items.item_ids:
-            statuses = QueueStatus.all().filter('queue_name =', queue.name()).filter('active_patch_id =', item_id).order('-date').fetch(1)
-            status = statuses[0].message if statuses else ""
+            patchStatusQuery = QueueStatus.all().filter('queue_name =', queue.name()).filter('active_patch_id =', item_id).order('-date')
+            statuses = patchStatusQuery.fetch(1)
+            message = None
+            message_time = None
+            bug_id = None
+            results_url = None
+            if statuses:
+                message = statuses[0].message
+                message_time = statuses[0].date
+                bug_id = statuses[0].active_bug_id
+                results_url = self.request.host_url + "/results/" + str(statuses[0].key().id()) if statuses[0].results_file else None
+
             rows.append({
                 "attachment_id": item_id,
+                "bug_id": bug_id,
                 "active": active_items and active_items.time_for_item(item_id) != None,
-                "status": status,
+                "active_since": active_items and active_items.time_for_item(item_id),
+                "latest_message": message,
+                "latest_message_time": message_time,
+                "message_count": patchStatusQuery.count(),
                 "status_page": self.request.host_url + "/patch/" + str(item_id),
+                "latest_results": results_url,
             })
         return rows
 
     def _bots(self, queue):
+        # First, collect all bots that ever served this queue.
         bot_id_statuses = QueueStatus.all(projection=['bot_id'], distinct=True).filter('queue_name =', queue.name()).fetch(500)
         bot_ids = list(entry.bot_id for entry in bot_id_statuses)
@@ -62 +78 @@
         for bot_id in bot_ids:
             status = QueueStatus.all().filter('bot_id =', bot_id).order('-date').get()
+
+            if status.queue_name != queue.name():
+                # The bot got re-purposed, and is serving a different queue now.
+                continue
+
             result.append({
                 "bot_id": bot_id,
@@ -67 +88 @@
                 "latest_message": status.message,
                 "latest_message_time": status.date,
+                "latest_message_bug_id": status.active_bug_id,
+                "latest_message_patch_id": status.active_patch_id,
                 "latest_output": self.request.host_url + "/results/" + str(status.key().id()) if status.results_file else None,
-                "active_bug_id": status.active_bug_id,
-                "active_patch_id": status.active_patch_id,
             })
         return result
@@ -86 +107 @@
         status = {
             "status_page": self.request.host_url + "/queue-status/" + queue_name,
+            "charts_page": self.request.host_url + "/queue-charts/" + queue_name,
             "queue": self._rows_for_work_items(queue),
             "bots": self._bots(queue),

trunk/Tools/QueueStatusServer/main.py

@@ -41 +41 @@
 from handlers.patchstatus import PatchStatus
 from handlers.queuecharts import QueueCharts
+from handlers.queuelengthjson import QueueLengthJSON
 from handlers.queuestatus import QueueStatus
 from handlers.queuestatusjson import QueueStatusJSON
@@ -69 +70 @@
     (r'/svn-revision/(.*)', SVNRevision),
     (r'/queue-charts/(.*)', QueueCharts),
+    (r'/queue-length-json/(.*)', QueueLengthJSON),
     (r'/queue-status/(.*)/bots/(.*)', QueueStatus),
     (r'/queue-status/(.*)', QueueStatus),