Appscale queue status json output lacks bots

https://bugs.webkit.org/show_bug.cgi?id=149194
<rdar://problem/22171089>

Patch by Aakash Jain <aakash_jain@apple.com> on 2015-09-15
Reviewed by Alexey Proskuryakov.

* QueueStatusServer/handlers/queuestatusjson.py:
(QueueStatusJSON._bots): Order the results by date so as to get latest events, this was default in AppEngine.
* QueueStatusServer/index.yaml: Index according to appscale requirements.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@189839 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 48bc436..f128d49 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,15 @@
+2015-09-15  Aakash Jain  <aakash_jain@apple.com>
+
+        Appscale queue status json output lacks bots
+        https://bugs.webkit.org/show_bug.cgi?id=149194
+        <rdar://problem/22171089>
+
+        Reviewed by Alexey Proskuryakov.
+
+        * QueueStatusServer/handlers/queuestatusjson.py:
+        (QueueStatusJSON._bots): Order the results by date so as to get latest events, this was default in AppEngine.
+        * QueueStatusServer/index.yaml: Index according to appscale requirements.
+
 2015-09-15  Brent Fulgham  <bfulgham@apple.com>
 
         [Win] Provide a means for viewing the layer tree

diff --git a/Tools/QueueStatusServer/handlers/queuestatusjson.py b/Tools/QueueStatusServer/handlers/queuestatusjson.py
index 473c98c..7372b24 100644 (file)
--- a/Tools/QueueStatusServer/handlers/queuestatusjson.py
+++ b/Tools/QueueStatusServer/handlers/queuestatusjson.py
@@ -78,7 +78,7 @@ class QueueStatusJSON(webapp.RequestHandler):
 
     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_id_statuses = QueueStatus.all(projection=['bot_id'], distinct=True).filter('queue_name =', queue.name()).order('-date').fetch(500)
         bot_ids = list(entry.bot_id for entry in bot_id_statuses)
         result = []
         for bot_id in bot_ids:

diff --git a/Tools/QueueStatusServer/index.yaml b/Tools/QueueStatusServer/index.yaml
index 5e9d1da..517ef7b 100644 (file)
--- a/Tools/QueueStatusServer/index.yaml
+++ b/Tools/QueueStatusServer/index.yaml
@@ -49,10 +49,10 @@ indexes:
 
 - kind: QueueStatus
   properties:
-  - name: bot_id
   - name: queue_name
   - name: date
     direction: desc
+  - name: bot_id
 
 - kind: QueueStatus
   properties: