<!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>[194935] trunk/Websites/perf.webkit.org</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/194935">194935</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-12 17:05:20 -0800 (Tue, 12 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>buildbot syncing scripts sometimes schedule more than one requests per builder
https://bugs.webkit.org/show_bug.cgi?id=153047
Reviewed by Chris Dumez.
The bug was caused by the check for singularity of scheduledRequests being conducted per configuration
instead of per builder. So if there were multiple test configurations (e.g. Speedometer and Octane) that
both used the same builder, then we may end up scheduling both at once.
Fixed the bug by sharing a single set to keep track of the scheduled requests for all configurations per
builder.
* tools/sync-with-buildbot.py:
(load_config): Share a set amongst test configurations for each builder.
(find_request_updates): Instead of creating a new set for each configuration, reuse the existing sets to
share a single set agmonst test configurations for each builder.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebsitesperfwebkitorgChangeLog">trunk/Websites/perf.webkit.org/ChangeLog</a></li>
<li><a href="#trunkWebsitesperfwebkitorgtoolssyncwithbuildbotpy">trunk/Websites/perf.webkit.org/tools/sync-with-buildbot.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebsitesperfwebkitorgChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/ChangeLog (194934 => 194935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/ChangeLog 2016-01-13 00:32:00 UTC (rev 194934)
+++ trunk/Websites/perf.webkit.org/ChangeLog 2016-01-13 01:05:20 UTC (rev 194935)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2016-01-12 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><ins>+ buildbot syncing scripts sometimes schedule more than one requests per builder
+ https://bugs.webkit.org/show_bug.cgi?id=153047
+
+ Reviewed by Chris Dumez.
+
+ The bug was caused by the check for singularity of scheduledRequests being conducted per configuration
+ instead of per builder. So if there were multiple test configurations (e.g. Speedometer and Octane) that
+ both used the same builder, then we may end up scheduling both at once.
+
+ Fixed the bug by sharing a single set to keep track of the scheduled requests for all configurations per
+ builder.
+
+ * tools/sync-with-buildbot.py:
+ (load_config): Share a set amongst test configurations for each builder.
+ (find_request_updates): Instead of creating a new set for each configuration, reuse the existing sets to
+ share a single set agmonst test configurations for each builder.
+
+2016-01-12 Ryosuke Niwa <rniwa@webkit.org>
+
</ins><span class="cx"> Analysis results viewer sometimes doesn't show the correct relative difference
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=152930
</span><span class="cx">
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgtoolssyncwithbuildbotpy"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/tools/sync-with-buildbot.py (194934 => 194935)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/tools/sync-with-buildbot.py 2016-01-13 00:32:00 UTC (rev 194934)
+++ trunk/Websites/perf.webkit.org/tools/sync-with-buildbot.py 2016-01-13 01:05:20 UTC (rev 194935)
</span><span class="lines">@@ -79,6 +79,8 @@
</span><span class="cx"> else:
</span><span class="cx"> config[key] = value
</span><span class="cx">
</span><ins>+ scheduled_requests_by_builder = {}
+
</ins><span class="cx"> configurations = options['configurations']
</span><span class="cx"> for config in configurations:
</span><span class="cx">
</span><span class="lines">@@ -89,8 +91,10 @@
</span><span class="cx"> escaped_builder_name = urllib.quote(config['builder'])
</span><span class="cx"> config['url'] = '%s/builders/%s/' % (buildbot_url, escaped_builder_name)
</span><span class="cx"> config['jsonURL'] = '%s/json/builders/%s/' % (buildbot_url, escaped_builder_name)
</span><del>- config['scheduledRequests'] = set()
</del><span class="cx">
</span><ins>+ scheduled_requests_by_builder.setdefault(config['builder'], set())
+ config['scheduledRequests'] = scheduled_requests_by_builder[config['builder']]
+
</ins><span class="cx"> return configurations
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -98,12 +102,15 @@
</span><span class="cx"> request_updates = {}
</span><span class="cx">
</span><span class="cx"> for config in configurations:
</span><ins>+ config['scheduledRequests'].clear()
+
+ for config in configurations:
</ins><span class="cx"> try:
</span><span class="cx"> pending_builds = fetch_json(config['jsonURL'] + 'pendingBuilds')
</span><span class="cx"> scheduled_requests = filter(None, [request_id_from_build(config, build) for build in pending_builds])
</span><span class="cx"> for request_id in scheduled_requests:
</span><span class="cx"> request_updates[request_id] = {'status': 'scheduled', 'url': config['url']}
</span><del>- config['scheduledRequests'] = set(scheduled_requests)
</del><ins>+ config['scheduledRequests'].add(request_id)
</ins><span class="cx"> except (IOError, ValueError) as error:
</span><span class="cx"> print >> sys.stderr, "Failed to fetch pending builds for %s: %s" % (config['builder'], str(error))
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>