<!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>[196195] 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/196195">196195</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2016-02-05 15:55:58 -0800 (Fri, 05 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Testing with remote server cache is unusably slow
https://bugs.webkit.org/show_bug.cgi?id=153928
Reviewed by Chris Dumez.
Don't use the single process mode of httpd as it's way too slow even for testing.
Also we'll hit a null pointer crash (http://svn.apache.org/viewvc?view=revision&revision=1711479)
Since httpd exits immediately when launched in multi-process mode, remote-cache-server.py (renamed from
run-with-remote-server.py) now has "start" and "stop" commands to start/stop the Apache. Also added
"reset" command to reset the cache for convenience.
* Install.md: Updated the instruction.
* config.json: Fixed a typo: httpdErro*r*Log.
* tools/remote-cache-server.py: Copied from Websites/perf.webkit.org/tools/run-with-remote-server.py.
Now takes one of the following commands: "start", "stop", and "reset".
(main):
(start_httpd): Extracted from main.
(stop_httpd): Added.
* tools/remote-server-relay.conf: Removed redundant (duplicate) LoadModule's.
* tools/run-with-remote-server.py: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebsitesperfwebkitorgChangeLog">trunk/Websites/perf.webkit.org/ChangeLog</a></li>
<li><a href="#trunkWebsitesperfwebkitorgInstallmd">trunk/Websites/perf.webkit.org/Install.md</a></li>
<li><a href="#trunkWebsitesperfwebkitorgconfigjson">trunk/Websites/perf.webkit.org/config.json</a></li>
<li><a href="#trunkWebsitesperfwebkitorgtoolsremoteserverrelayconf">trunk/Websites/perf.webkit.org/tools/remote-server-relay.conf</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkWebsitesperfwebkitorgtoolsremotecacheserverpy">trunk/Websites/perf.webkit.org/tools/remote-cache-server.py</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkWebsitesperfwebkitorgtoolsrunwithremoteserverpy">trunk/Websites/perf.webkit.org/tools/run-with-remote-server.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 (196194 => 196195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/ChangeLog 2016-02-05 23:32:54 UTC (rev 196194)
+++ trunk/Websites/perf.webkit.org/ChangeLog 2016-02-05 23:55:58 UTC (rev 196195)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-02-05 Ryosuke Niwa <rniwa@webkit.org>
+
+ Testing with remote server cache is unusably slow
+ https://bugs.webkit.org/show_bug.cgi?id=153928
+
+ Reviewed by Chris Dumez.
+
+ Don't use the single process mode of httpd as it's way too slow even for testing.
+ Also we'll hit a null pointer crash (http://svn.apache.org/viewvc?view=revision&revision=1711479)
+
+ Since httpd exits immediately when launched in multi-process mode, remote-cache-server.py (renamed from
+ run-with-remote-server.py) now has "start" and "stop" commands to start/stop the Apache. Also added
+ "reset" command to reset the cache for convenience.
+
+ * Install.md: Updated the instruction.
+ * config.json: Fixed a typo: httpdErro*r*Log.
+ * tools/remote-cache-server.py: Copied from Websites/perf.webkit.org/tools/run-with-remote-server.py.
+ Now takes one of the following commands: "start", "stop", and "reset".
+ (main):
+ (start_httpd): Extracted from main.
+ (stop_httpd): Added.
+ * tools/remote-server-relay.conf: Removed redundant (duplicate) LoadModule's.
+ * tools/run-with-remote-server.py: Removed.
+
</ins><span class="cx"> 2016-02-04 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Perf dashboard should have a script to setup database
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgInstallmd"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/Install.md (196194 => 196195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/Install.md 2016-02-05 23:32:54 UTC (rev 196194)
+++ trunk/Websites/perf.webkit.org/Install.md 2016-02-05 23:55:58 UTC (rev 196195)
</span><span class="lines">@@ -28,13 +28,10 @@
</span><span class="cx"> }
</span><span class="cx"> ```
</span><span class="cx">
</span><del>-Then run `tools/run-with-remote-server.py`. This launches a httpd server on port 8080.
</del><ins>+Then run `tools/remote-cache-server.py start`. This launches a httpd server on port 8080.
</ins><span class="cx">
</span><del>-The initial few page loads after starting the script could take as much as a few minutes depending on your production sever's configurations
-since Apache needs to start a pool of processes. Reloading the dashboards few times should bring the load time under control.
-
</del><span class="cx"> The script caches remote server's responses under `public/data/remote-cache` and never revalidates them (to allow offline work).
</span><del>-If you needed the latest content, delete caches stored in this directory by running `rm -rf public/data/remote-cache`.
</del><ins>+If you needed the latest content, delete caches stored in this directory by running `tools/remote-cache-server.py reset`.
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> # Configuring Apache
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgconfigjson"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/config.json (196194 => 196195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/config.json 2016-02-05 23:32:54 UTC (rev 196194)
+++ trunk/Websites/perf.webkit.org/config.json 2016-02-05 23:55:58 UTC (rev 196195)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx"> "remoteServer": {
</span><span class="cx"> "httpdConfig": "tools/remote-server-relay.conf",
</span><span class="cx"> "httpdPID": "tools/remote-server-relay.pid",
</span><del>- "httpdErroLog": "tools/remote-server-relay.log",
</del><ins>+ "httpdErrorLog": "tools/remote-server-relay.log",
</ins><span class="cx"> "url": "http://perf.webkit.org",
</span><span class="cx"> "basicAuth": {
</span><span class="cx"> "username": "username",
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgtoolsremotecacheserverpyfromrev196191trunkWebsitesperfwebkitorgtoolsrunwithremoteserverpy"></a>
<div class="copfile"><h4>Copied: trunk/Websites/perf.webkit.org/tools/remote-cache-server.py (from rev 196191, trunk/Websites/perf.webkit.org/tools/run-with-remote-server.py) (0 => 196195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/tools/remote-cache-server.py (rev 0)
+++ trunk/Websites/perf.webkit.org/tools/remote-cache-server.py 2016-02-05 23:55:58 UTC (rev 196195)
</span><span class="lines">@@ -0,0 +1,72 @@
</span><ins>+#!/usr/bin/python
+
+import json
+import os
+import shutil
+import subprocess
+import sys
+import tempfile
+
+
+def main():
+ if len(sys.argv) <= 1:
+ sys.exit('Specify the command: start, stop, reset')
+
+ command = sys.argv[1]
+
+ with open(abspath_from_root('config.json')) as config_file:
+ config = json.load(config_file)
+
+ cache_dir = abspath_from_root(config['cacheDirectory'])
+ if command == 'start':
+ if not os.path.isdir(cache_dir):
+ os.makedirs(cache_dir)
+ os.chmod(cache_dir, 0755)
+
+ start_httpd(config['remoteServer'])
+ elif command == 'stop':
+ stop_httpd(config['remoteServer'])
+ elif command == 'reset':
+ shutil.rmtree(cache_dir)
+ else:
+ sys.exit('Unknown command: ' + command)
+
+
+def start_httpd(remote_server_config):
+ httpd_config_file = abspath_from_root(remote_server_config['httpdConfig'])
+ httpd_pid_file = abspath_from_root(remote_server_config['httpdPID'])
+ httpd_error_log_file = abspath_from_root(remote_server_config['httpdErrorLog'])
+ httpd_mutex_dir = abspath_from_root(remote_server_config['httpdMutexDir'])
+
+ if not os.path.isdir(httpd_mutex_dir):
+ os.makedirs(httpd_mutex_dir)
+ os.chmod(httpd_mutex_dir, 0755)
+
+ doc_root = abspath_from_root('public')
+
+ # don't use -X since http://svn.apache.org/viewvc?view=revision&revision=1711479
+ subprocess.call(['httpd',
+ '-f', httpd_config_file,
+ '-c', 'PidFile ' + httpd_pid_file,
+ '-c', 'Mutex file:' + httpd_mutex_dir,
+ '-c', 'DocumentRoot ' + doc_root,
+ '-c', 'ErrorLog ' + httpd_error_log_file])
+
+
+def stop_httpd(remote_server_config):
+ httpd_pid_file = abspath_from_root(remote_server_config['httpdPID'])
+ if not os.path.isfile(httpd_pid_file):
+ sys.exit("PID file doesn't exist at %s" % httpd_pid_file)
+
+ with open(httpd_pid_file) as pid_file:
+ pid = pid_file.read().strip()
+ print "Stopping", pid
+ subprocess.call(['kill', '-TERM', pid])
+
+
+def abspath_from_root(relpath):
+ return os.path.abspath(os.path.join(os.path.dirname(__file__), '../', relpath))
+
+
+if __name__ == "__main__":
+ main()
</ins></span></pre></div>
<a id="trunkWebsitesperfwebkitorgtoolsremoteserverrelayconf"></a>
<div class="modfile"><h4>Modified: trunk/Websites/perf.webkit.org/tools/remote-server-relay.conf (196194 => 196195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/tools/remote-server-relay.conf 2016-02-05 23:32:54 UTC (rev 196194)
+++ trunk/Websites/perf.webkit.org/tools/remote-server-relay.conf 2016-02-05 23:55:58 UTC (rev 196195)
</span><span class="lines">@@ -16,9 +16,7 @@
</span><span class="cx"> LoadModule dir_module libexec/apache2/mod_dir.so
</span><span class="cx"> LoadModule alias_module libexec/apache2/mod_alias.so
</span><span class="cx"> LoadModule rewrite_module libexec/apache2/mod_rewrite.so
</span><del>-LoadModule mime_module libexec/apache2/mod_mime.so
</del><span class="cx"> LoadModule php5_module libexec/apache2/libphp5.so
</span><del>-LoadModule negotiation_module libexec/apache2/mod_negotiation.so
</del><span class="cx">
</span><span class="cx"> <Directory />
</span><span class="cx"> Options Indexes FollowSymLinks MultiViews
</span></span></pre></div>
<a id="trunkWebsitesperfwebkitorgtoolsrunwithremoteserverpy"></a>
<div class="delfile"><h4>Deleted: trunk/Websites/perf.webkit.org/tools/run-with-remote-server.py (196194 => 196195)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Websites/perf.webkit.org/tools/run-with-remote-server.py 2016-02-05 23:32:54 UTC (rev 196194)
+++ trunk/Websites/perf.webkit.org/tools/run-with-remote-server.py 2016-02-05 23:55:58 UTC (rev 196195)
</span><span class="lines">@@ -1,40 +0,0 @@
</span><del>-#!/usr/bin/python
-
-import json
-import os
-import subprocess
-import tempfile
-
-
-def main():
- with open(abspath_from_root('config.json')) as config_file:
- config = json.load(config_file)
- cache_dir = abspath_from_root(config['cacheDirectory'])
- httpd_config_file = abspath_from_root(config['remoteServer']['httpdConfig'])
- httpd_pid_file = abspath_from_root(config['remoteServer']['httpdPID'])
- httpd_error_log_file = abspath_from_root(config['remoteServer']['httpdErroLog'])
- doc_root = abspath_from_root('public')
-
- if not os.path.isdir(cache_dir):
- os.makedirs(cache_dir)
- os.chmod(cache_dir, 0755)
-
- httpd_mutax_dir = tempfile.mkdtemp()
- try:
- subprocess.call(['httpd',
- '-f', httpd_config_file,
- '-c', 'PidFile ' + httpd_pid_file,
- '-c', 'Mutex file:' + httpd_mutax_dir,
- '-c', 'DocumentRoot ' + doc_root,
- '-c', 'ErrorLog ' + httpd_error_log_file,
- '-X'])
- finally:
- os.rmdir(httpd_mutax_dir)
-
-
-def abspath_from_root(relpath):
- return os.path.abspath(os.path.join(os.path.dirname(__file__), '../', relpath))
-
-
-if __name__ == "__main__":
- main()
</del></span></pre>
</div>
</div>
</body>
</html>