<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[174115] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/174115">174115</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2014-09-30 12:48:09 -0700 (Tue, 30 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>build.webkit.org/dashboard: Switch EWS view to using actual retry count
https://bugs.webkit.org/show_bug.cgi?id=137240
Reviewed by Ryosuke Niwa.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/EWSQueue.js:
(EWSQueue.prototype.loadDetailedStatus):
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/EWSQueueView.js:
(EWSQueueView.prototype._popoverContentForEWSQueue):
Use the new retry_count data member from JSON.
* QueueStatusServer/app.yaml: Updating the version.
* QueueStatusServer/handlers/queuestatusjson.py: (QueueStatusJSON._rows_for_work_items):
Instead of message_count, produce retry_count.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsEWSQueuejs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/EWSQueue.js</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsEWSQueueViewjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/EWSQueueView.js</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsQueueStatusServerappyaml">trunk/Tools/QueueStatusServer/app.yaml</a></li>
<li><a href="#trunkToolsQueueStatusServerhandlersqueuestatusjsonpy">trunk/Tools/QueueStatusServer/handlers/queuestatusjson.py</a></li>
<li><a href="#trunkToolsQueueStatusServertemplatesstatusbubblehtml">trunk/Tools/QueueStatusServer/templates/statusbubble.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsEWSQueuejs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/EWSQueue.js (174114 => 174115)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/EWSQueue.js 2014-09-30 19:43:58 UTC (rev 174114)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/EWSQueue.js 2014-09-30 19:48:09 UTC (rev 174115)
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> latestMessage: patch.latest_message,
</span><span class="cx"> latestMessageTime: patch.latest_message_time ? new Date(patch.latest_message_time) : null,
</span><span class="cx"> detailedResultsURLForLatestMessage: patch.latest_results,
</span><del>- messageCount: patch.message_count,
</del><ins>+ retryCount: patch.retry_count,
</ins><span class="cx"> active: patch.active,
</span><span class="cx"> activeSince: new Date(activeSinceTime),
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsEWSQueueViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/EWSQueueView.js (174114 => 174115)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/EWSQueueView.js 2014-09-30 19:43:58 UTC (rev 174114)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/EWSQueueView.js 2014-09-30 19:48:09 UTC (rev 174115)
</span><span class="lines">@@ -154,8 +154,8 @@
</span><span class="cx">
</span><span class="cx"> this.addLinkToRow(rowElement, "patch-details-link", patch.attachmentID, patch.statusPageURL);
</span><span class="cx">
</span><del>- if (patch.messageCount)
- this.addTextToRow(rowElement, "failure-count", patch.messageCount + "\xa0" + (patch.messageCount === 1 ? "attempt" : "attempts"));
</del><ins>+ if (patch.retryCount)
+ this.addTextToRow(rowElement, "failure-count", patch.retryCount + "\xa0" + (patch.retryCount === 1 ? "attempt" : "attempts"));
</ins><span class="cx">
</span><span class="cx"> if (patch.detailedResultsURLForLatestMessage)
</span><span class="cx"> this.addLinkToRow(rowElement, "latest-status-with-link", patch.latestMessage, patch.detailedResultsURLForLatestMessage);
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (174114 => 174115)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-09-30 19:43:58 UTC (rev 174114)
+++ trunk/Tools/ChangeLog 2014-09-30 19:48:09 UTC (rev 174115)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2014-09-30 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><ins>+ build.webkit.org/dashboard: Switch EWS view to using actual retry count
+ https://bugs.webkit.org/show_bug.cgi?id=137240
+
+ Reviewed by Ryosuke Niwa.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/EWSQueue.js:
+ (EWSQueue.prototype.loadDetailedStatus):
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/EWSQueueView.js:
+ (EWSQueueView.prototype._popoverContentForEWSQueue):
+ Use the new retry_count data member from JSON.
+
+ * QueueStatusServer/app.yaml: Updating the version.
+
+ * QueueStatusServer/handlers/queuestatusjson.py: (QueueStatusJSON._rows_for_work_items):
+ Instead of message_count, produce retry_count.
+
+2014-09-30 Alexey Proskuryakov <ap@apple.com>
+
</ins><span class="cx"> EWS doesn't need to show all the bubbles when a patch fails to apply
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=137256
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsQueueStatusServerappyaml"></a>
<div class="modfile"><h4>Modified: trunk/Tools/QueueStatusServer/app.yaml (174114 => 174115)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/QueueStatusServer/app.yaml 2014-09-30 19:43:58 UTC (rev 174114)
+++ trunk/Tools/QueueStatusServer/app.yaml 2014-09-30 19:48:09 UTC (rev 174115)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> application: webkit-queues
</span><del>-version: 174114 # Bugzilla bug ID of last major change
</del><ins>+version: 174115 # Bugzilla bug ID of last major change
</ins><span class="cx"> runtime: python
</span><span class="cx"> api_version: 1
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsQueueStatusServerhandlersqueuestatusjsonpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/QueueStatusServer/handlers/queuestatusjson.py (174114 => 174115)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/QueueStatusServer/handlers/queuestatusjson.py 2014-09-30 19:43:58 UTC (rev 174114)
+++ trunk/Tools/QueueStatusServer/handlers/queuestatusjson.py 2014-09-30 19:48:09 UTC (rev 174115)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> from google.appengine.ext import webapp
</span><span class="cx"> from google.appengine.ext.webapp import template
</span><span class="cx">
</span><ins>+from model.patchlog import PatchLog
</ins><span class="cx"> from model.queues import Queue
</span><span class="cx"> from model.queuestatus import QueueStatus
</span><span class="cx">
</span><span class="lines">@@ -57,17 +58,22 @@
</span><span class="cx"> bug_id = statuses[0].active_bug_id
</span><span class="cx"> results_url = self.request.host_url + "/results/" + str(statuses[0].key().id()) if statuses[0].results_file else None
</span><span class="cx">
</span><del>- rows.append({
</del><ins>+ row = {
</ins><span class="cx"> "attachment_id": item_id,
</span><span class="cx"> "bug_id": bug_id,
</span><span class="cx"> "active": active_items and active_items.time_for_item(item_id) != None,
</span><span class="cx"> "active_since": active_items and active_items.time_for_item(item_id),
</span><span class="cx"> "latest_message": message,
</span><span class="cx"> "latest_message_time": message_time,
</span><del>- "message_count": patchStatusQuery.count(),
</del><span class="cx"> "status_page": self.request.host_url + "/patch/" + str(item_id),
</span><span class="cx"> "latest_results": results_url,
</span><del>- })
</del><ins>+ }
+
+ patch_log = PatchLog.lookup_if_exists(item_id, queue.name())
+ if patch_log and patch_log.retry_count:
+ row["retry_count"] = patch_log.retry_count
+
+ rows.append(row)
</ins><span class="cx"> return rows
</span><span class="cx">
</span><span class="cx"> def _bots(self, queue):
</span></span></pre></div>
<a id="trunkToolsQueueStatusServertemplatesstatusbubblehtml"></a>
<div class="modfile"><h4>Modified: trunk/Tools/QueueStatusServer/templates/statusbubble.html (174114 => 174115)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/QueueStatusServer/templates/statusbubble.html 2014-09-30 19:43:58 UTC (rev 174114)
+++ trunk/Tools/QueueStatusServer/templates/statusbubble.html 2014-09-30 19:48:09 UTC (rev 174115)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> background-color: #E98080;
</span><span class="cx"> }
</span><span class="cx"> .started {
</span><del>- background-color: #D8FFFA;
</del><ins>+ background-color: #E1F5FF;
</ins><span class="cx"> }
</span><span class="cx"> .provisional-fail {
</span><span class="cx"> background-color: #FFAF05;
</span></span></pre>
</div>
</div>
</body>
</html>