<!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>[163314] 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/163314">163314</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-03 10:37:11 -0800 (Mon, 03 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>WebKit Bot Watcher's Dashboard: Defer subsequent resource loads from access-restricted build bot when
iteration fails to load with HTTP 401 status code
https://bugs.webkit.org/show_bug.cgi?id=128077
Reviewed by Alexey Proskuryakov.
Similar to the fix for <https://bugs.webkit.org/show_bug.cgi?id=127849>, we should only prompt for
the HTTP credentials of a build bot so long as an earlier authentication request wasn't cancelled
(i.e. failed with an HTTP 401 Unauthorized status code). Currently an authentication dialog will be
presented for an iteration each time the update queue timer fires until a person successfully
authenticates. Instead we should update the authentication status of the build bot on receiving an
HTTP 401 response code such that we defer subsequent requests to load any resource from the access-
restricted build bot when the queue update timer fires.
A person must explicitly click the "unauthorized" status line shown for the queue associated with the
iteration in the dashboard and authenticate successfully for the iteration to be loaded once an
authentication request for an iteration is cancelled.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js:
(BuildbotIteration.prototype.update): Early return if the associated Buildbot was given invalid credentials.
Also notify the associated Buildbot and update the queue view when a load failed with an HTTP 401 status code.
(BuildbotIteration.prototype.loadLayoutTestResults): Ditto.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js:
(BuildbotQueueView): Modified to call BuildbotQueueView.prototype._unauthorizedAccess instead of
QueueView.prototype._updateSoon when event BuildbotQueue.Event.UnauthorizedAccess is received.
(BuildbotQueueView.prototype._unauthorizedAccess): Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotIterationjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotQueueViewjs">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotIterationjs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js (163313 => 163314)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js 2014-02-03 18:08:59 UTC (rev 163313)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js 2014-02-03 18:37:11 UTC (rev 163314)
</span><span class="lines">@@ -59,7 +59,8 @@
</span><span class="cx"> BuildbotIteration.RETRY = 5;
</span><span class="cx">
</span><span class="cx"> BuildbotIteration.Event = {
</span><del>- Updated: "updated"
</del><ins>+ Updated: "updated",
+ UnauthorizedAccess: "unauthorized-access"
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> // See <http://docs.buildbot.net/0.8.8/manual/cfg-properties.html>.
</span><span class="lines">@@ -157,6 +158,9 @@
</span><span class="cx"> if (this.loaded && this._finished)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ if (this.queue.buildbot.needsAuthentication && this.queue.buildbot.authenticationStatus === Buildbot.AuthenticationStatus.InvalidCredentials)
+ return;
+
</ins><span class="cx"> function collectTestResults(data, stepName)
</span><span class="cx"> {
</span><span class="cx"> var testStep = data.steps.findFirst(function(step) { return step.name === stepName; });
</span><span class="lines">@@ -211,6 +215,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSON.load(this.queue.baseURL + "/builds/" + this.id, function(data) {
</span><ins>+ this.queue.buildbot.isAuthenticated = true;
</ins><span class="cx"> if (!data || !data.properties)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -271,11 +276,20 @@
</span><span class="cx"> this.queue.sortIterations();
</span><span class="cx">
</span><span class="cx"> this.dispatchEventToListeners(BuildbotIteration.Event.Updated);
</span><del>- }.bind(this), null, {withCredentials: this.queue.buildbot.needsAuthentication});
</del><ins>+ }.bind(this),
+ function(data) {
+ if (data.errorType === JSON.LoadError && data.errorHTTPCode === 401) {
+ this.queue.buildbot.isAuthenticated = false;
+ this.dispatchEventToListeners(BuildbotIteration.Event.UnauthorizedAccess);
+ }
+ }.bind(this), {withCredentials: this.queue.buildbot.needsAuthentication});
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> loadLayoutTestResults: function(callback)
</span><span class="cx"> {
</span><ins>+ if (this.queue.buildbot.needsAuthentication && this.queue.buildbot.authenticationStatus === Buildbot.AuthenticationStatus.InvalidCredentials)
+ return;
+
</ins><span class="cx"> function collectResults(subtree, predicate)
</span><span class="cx"> {
</span><span class="cx"> // Results object is a trie:
</span><span class="lines">@@ -339,6 +353,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSON.load(this.queue.buildbot.layoutTestFullResultsURLForIteration(this), function(data) {
</span><ins>+ this.queue.buildbot.isAuthenticated = true;
</ins><span class="cx"> this.hasPrettyPatch = data.has_pretty_patch;
</span><span class="cx">
</span><span class="cx"> this.layoutTestResults.regressions = collectResults(data.tests, function(info) { return info["report"] === "REGRESSION" });
</span><span class="lines">@@ -353,8 +368,12 @@
</span><span class="cx"> callback();
</span><span class="cx"> }.bind(this),
</span><span class="cx"> function(data) {
</span><ins>+ if (data.errorType === JSON.LoadError && data.errorHTTPCode === 401) {
+ this.queue.buildbot.isAuthenticated = false;
+ this.dispatchEventToListeners(BuildbotIteration.Event.UnauthorizedAccess);
+ }
</ins><span class="cx"> console.log(data.error);
</span><span class="cx"> callback();
</span><del>- }, {jsonpCallbackName: "ADD_RESULTS", withCredentials: this.queue.buildbot.needsAuthentication});
</del><ins>+ }.bind(this), {jsonpCallbackName: "ADD_RESULTS", withCredentials: this.queue.buildbot.needsAuthentication});
</ins><span class="cx"> }
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigpublic_htmldashboardScriptsBuildbotQueueViewjs"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js (163313 => 163314)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js 2014-02-03 18:08:59 UTC (rev 163313)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js 2014-02-03 18:37:11 UTC (rev 163314)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> else
</span><span class="cx"> this.platform = queue.platform;
</span><span class="cx"> queue.addEventListener(BuildbotQueue.Event.IterationsAdded, this._queueIterationsAdded, this);
</span><del>- queue.addEventListener(BuildbotQueue.Event.UnauthorizedAccess, this.updateSoon, this);
</del><ins>+ queue.addEventListener(BuildbotQueue.Event.UnauthorizedAccess, this._unauthorizedAccess, this);
</ins><span class="cx"> }.bind(this));
</span><span class="cx">
</span><span class="cx"> this.debugQueues.forEach(function(queue) {
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> else
</span><span class="cx"> this.platform = queue.platform;
</span><span class="cx"> queue.addEventListener(BuildbotQueue.Event.IterationsAdded, this._queueIterationsAdded, this);
</span><del>- queue.addEventListener(BuildbotQueue.Event.UnauthorizedAccess, this.updateSoon, this);
</del><ins>+ queue.addEventListener(BuildbotQueue.Event.UnauthorizedAccess, this._unauthorizedAccess, this);
</ins><span class="cx"> }.bind(this));
</span><span class="cx">
</span><span class="cx"> webkitTrac.addEventListener(Trac.Event.NewCommitsRecorded, this._newCommitsRecorded, this);
</span><span class="lines">@@ -298,6 +298,7 @@
</span><span class="cx">
</span><span class="cx"> event.data.addedIterations.forEach(function(iteration) {
</span><span class="cx"> iteration.addEventListener(BuildbotIteration.Event.Updated, this._iterationUpdated, this);
</span><ins>+ iteration.addEventListener(BuildbotIteration.Event.UnauthorizedAccess, this._unauthorizedAccess, this);
</ins><span class="cx"> }.bind(this));
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -309,5 +310,10 @@
</span><span class="cx"> _newCommitsRecorded: function(event)
</span><span class="cx"> {
</span><span class="cx"> this.updateSoon();
</span><ins>+ },
+
+ _unauthorizedAccess: function(event)
+ {
+ this.updateSoon();
</ins><span class="cx"> }
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (163313 => 163314)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-02-03 18:08:59 UTC (rev 163313)
+++ trunk/Tools/ChangeLog 2014-02-03 18:37:11 UTC (rev 163314)
</span><span class="lines">@@ -1,5 +1,34 @@
</span><span class="cx"> 2014-02-03 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><ins>+ WebKit Bot Watcher's Dashboard: Defer subsequent resource loads from access-restricted build bot when
+ iteration fails to load with HTTP 401 status code
+ https://bugs.webkit.org/show_bug.cgi?id=128077
+
+ Reviewed by Alexey Proskuryakov.
+
+ Similar to the fix for <https://bugs.webkit.org/show_bug.cgi?id=127849>, we should only prompt for
+ the HTTP credentials of a build bot so long as an earlier authentication request wasn't cancelled
+ (i.e. failed with an HTTP 401 Unauthorized status code). Currently an authentication dialog will be
+ presented for an iteration each time the update queue timer fires until a person successfully
+ authenticates. Instead we should update the authentication status of the build bot on receiving an
+ HTTP 401 response code such that we defer subsequent requests to load any resource from the access-
+ restricted build bot when the queue update timer fires.
+
+ A person must explicitly click the "unauthorized" status line shown for the queue associated with the
+ iteration in the dashboard and authenticate successfully for the iteration to be loaded once an
+ authentication request for an iteration is cancelled.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotIteration.js:
+ (BuildbotIteration.prototype.update): Early return if the associated Buildbot was given invalid credentials.
+ Also notify the associated Buildbot and update the queue view when a load failed with an HTTP 401 status code.
+ (BuildbotIteration.prototype.loadLayoutTestResults): Ditto.
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js:
+ (BuildbotQueueView): Modified to call BuildbotQueueView.prototype._unauthorizedAccess instead of
+ QueueView.prototype._updateSoon when event BuildbotQueue.Event.UnauthorizedAccess is received.
+ (BuildbotQueueView.prototype._unauthorizedAccess): Added.
+
+2014-02-03 Daniel Bates <dabates@apple.com>
+
</ins><span class="cx"> WebKit Bot Watcher's Dashboard: Teach JSON.load() to interpret third argument as either an
</span><span class="cx"> option dictionary or a failure callback
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=128080
</span></span></pre>
</div>
</div>
</body>
</html>