<!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>[196386] 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/196386">196386</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2016-02-10 13:05:37 -0800 (Wed, 10 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add the support for maintenance mode
https://bugs.webkit.org/show_bug.cgi?id=154072
Reviewed by Chris Dumez.
Added the crude support for maintenance mode whereby which the reports are stored in the filesystem
instead of the database.
* config.json: Added maintenanceMode and maintenanceDirectory as well as forgotten siteTitle and
remoteServer.httpdMutexDir.
* public/api/report.php:
(main): Don't connect to the database or modify database when maintenanceMode is set.
* public/include/json-header.php:
(ensure_privileged_api_data): Exit with InMaintenanceMode when maintenanceMode is set. This prevents
privileged API such as creating analysis tasks and new A/B testing groups from modifying the database.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebsitesperfwebkitorgChangeLog">trunk/Websites/perf.webkit.org/ChangeLog</a></li>
<li><a href="#trunkWebsitesperfwebkitorgconfigjson">trunk/Websites/perf.webkit.org/config.json</a></li>
<li><a href="#trunkWebsitesperfwebkitorgpublicapireportphp">trunk/Websites/perf.webkit.org/public/api/report.php</a></li>
<li><a href="#trunkWebsitesperfwebkitorgpublicincludejsonheaderphp">trunk/Websites/perf.webkit.org/public/include/json-header.php</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 (196385 => 196386)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/ChangeLog 2016-02-10 20:56:26 UTC (rev 196385)
+++ trunk/Websites/perf.webkit.org/ChangeLog 2016-02-10 21:05:37 UTC (rev 196386)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-02-10 Ryosuke Niwa <rniwa@webkit.org>
+
+ Add the support for maintenance mode
+ https://bugs.webkit.org/show_bug.cgi?id=154072
+
+ Reviewed by Chris Dumez.
+
+ Added the crude support for maintenance mode whereby which the reports are stored in the filesystem
+ instead of the database.
+
+ * config.json: Added maintenanceMode and maintenanceDirectory as well as forgotten siteTitle and
+ remoteServer.httpdMutexDir.
+ * public/api/report.php:
+ (main): Don't connect to the database or modify database when maintenanceMode is set.
+ * public/include/json-header.php:
+ (ensure_privileged_api_data): Exit with InMaintenanceMode when maintenanceMode is set. This prevents
+ privileged API such as creating analysis tasks and new A/B testing groups from modifying the database.
+
</ins><span class="cx"> 2016-02-09 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Analysis task page on v3 show progression as regressions
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgconfigjson"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/config.json (196385 => 196386)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/config.json 2016-02-10 20:56:26 UTC (rev 196385)
+++ trunk/Websites/perf.webkit.org/config.json 2016-02-10 21:05:37 UTC (rev 196386)
</span><span class="lines">@@ -1,4 +1,5 @@
</span><span class="cx"> {
</span><ins>+ "siteTitle": "WebKit Performance Dashboard",
</ins><span class="cx"> "debug": true,
</span><span class="cx"> "jsonCacheMaxAge": 600,
</span><span class="cx"> "dataDirectory": "public/data/",
</span><span class="lines">@@ -9,6 +10,8 @@
</span><span class="cx"> "password": "password",
</span><span class="cx"> "name": "webkit-perf-db"
</span><span class="cx"> },
</span><ins>+ "maintenanceMode": false,
+ "maintenanceDirectory": "reported/",
</ins><span class="cx"> "testServer": {
</span><span class="cx"> "hostname": "localhost",
</span><span class="cx"> "port": 80
</span><span class="lines">@@ -20,7 +23,8 @@
</span><span class="cx"> "httpdConfig": "tools/remote-server-relay.conf",
</span><span class="cx"> "httpdPID": "tools/remote-server-relay.pid",
</span><span class="cx"> "httpdErrorLog": "tools/remote-server-relay.log",
</span><del>- "url": "http://perf.webkit.org",
</del><ins>+ "httpdMutexDir": "/tmp/org.webkit.perf.remote/",
+ "url": "https://perf-safari.apple.com",
</ins><span class="cx"> "basicAuth": {
</span><span class="cx"> "username": "username",
</span><span class="cx"> "password": "password"
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgpublicapireportphp"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/public/api/report.php (196385 => 196386)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/public/api/report.php 2016-02-10 20:56:26 UTC (rev 196385)
+++ trunk/Websites/perf.webkit.org/public/api/report.php 2016-02-10 21:05:37 UTC (rev 196386)
</span><span class="lines">@@ -7,8 +7,12 @@
</span><span class="cx"> function main($post_data) {
</span><span class="cx"> set_exit_detail('failureStored', false);
</span><span class="cx">
</span><ins>+ $maintenance_mode = config('maintenanceMode');
+ if ($maintenance_mode && !config('maintenanceDirectory'))
+ exit_with_error('MaintenanceDirectoryNotSet');
+
</ins><span class="cx"> $db = new Database;
</span><del>- if (!$db->connect())
</del><ins>+ if (!$maintenance_mode && !$db->connect())
</ins><span class="cx"> exit_with_error('DatabaseConnectionFailure');
</span><span class="cx">
</span><span class="cx"> // Convert all floating points to strings to avoid parsing them in PHP.
</span><span class="lines">@@ -19,16 +23,29 @@
</span><span class="cx">
</span><span class="cx"> set_exit_detail('processedRuns', 0);
</span><span class="cx"> foreach ($parsed_json as $i => $report) {
</span><del>- $processor = new ReportProcessor($db);
- $processor->process($report);
</del><ins>+ if (!$maintenance_mode) {
+ $processor = new ReportProcessor($db);
+ $processor->process($report);
+ }
</ins><span class="cx"> set_exit_detail('processedRuns', $i + 1);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $generator = new ManifestGenerator($db);
- if (!$generator->generate())
- exit_with_error('FailedToGenerateManifest');
- else if (!$generator->store())
- exit_with_error('FailedToStoreManifest');
</del><ins>+ if ($maintenance_mode) {
+ $files = scandir(config_path('maintenanceDirectory', ''));
+ $i = 0;
+ $filename = '';
+ do {
+ $i++;
+ $filename = "$i.json";
+ } while (in_array($filename, $files));
+ file_put_contents(config_path('maintenanceDirectory', $filename), $post_data, LOCK_EX);
+ } else {
+ $generator = new ManifestGenerator($db);
+ if (!$generator->generate())
+ exit_with_error('FailedToGenerateManifest');
+ else if (!$generator->store())
+ exit_with_error('FailedToStoreManifest');
+ }
</ins><span class="cx">
</span><span class="cx"> exit_with_success();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgpublicincludejsonheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/public/include/json-header.php (196385 => 196386)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/public/include/json-header.php 2016-02-10 20:56:26 UTC (rev 196385)
+++ trunk/Websites/perf.webkit.org/public/include/json-header.php 2016-02-10 21:05:37 UTC (rev 196386)
</span><span class="lines">@@ -92,6 +92,9 @@
</span><span class="cx"> function ensure_privileged_api_data() {
</span><span class="cx"> global $HTTP_RAW_POST_DATA;
</span><span class="cx">
</span><ins>+ if (config('maintenanceMode'))
+ exit_with_error('InMaintenanceMode');
+
</ins><span class="cx"> if ($_SERVER['REQUEST_METHOD'] != 'POST')
</span><span class="cx"> exit_with_error('InvalidRequestMethod');
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>