<!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>[185244] 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/185244">185244</a></dd>
<dt>Author</dt> <dd>slewis@apple.com</dd>
<dt>Date</dt> <dd>2015-06-05 02:11:24 -0700 (Fri, 05 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make the web server more robust to timing issues..
Reviewed by Ryosuke Niwa.
Cleaned up exception handling.
Test server is actually serving pages before returning.
Clean up some style issues.
* Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py:
* Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py:
(SimpleHTTPServerDriver.__init__):
(SimpleHTTPServerDriver.serve): check output, wait for pages to serve
(SimpleHTTPServerDriver.baseUrl):
(SimpleHTTPServerDriver.fetchResult):
(SimpleHTTPServerDriver.killServer):
(SimpleHTTPServerDriver.getReturnCode):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerhttp_server_driverhttp_servertwisted_http_serverpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerhttp_server_driversimple_http_server_driverpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (185243 => 185244)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-06-05 09:11:21 UTC (rev 185243)
+++ trunk/Tools/ChangeLog 2015-06-05 09:11:24 UTC (rev 185244)
</span><span class="lines">@@ -1,6 +1,25 @@
</span><span class="cx"> 2015-06-05 Stephanie Lewis <slewis@apple.com>
</span><span class="cx">
</span><ins>+ Make the web server more robust to timing issues..
</ins><span class="cx">
</span><ins>+ Reviewed by Ryosuke Niwa.
+
+ Cleaned up exception handling.
+ Test server is actually serving pages before returning.
+ Clean up some style issues.
+
+ * Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py:
+ * Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py:
+ (SimpleHTTPServerDriver.__init__):
+ (SimpleHTTPServerDriver.serve): check output, wait for pages to serve
+ (SimpleHTTPServerDriver.baseUrl):
+ (SimpleHTTPServerDriver.fetchResult):
+ (SimpleHTTPServerDriver.killServer):
+ (SimpleHTTPServerDriver.getReturnCode):
+
+2015-06-05 Stephanie Lewis <slewis@apple.com>
+
+
</ins><span class="cx"> Add errors to run-benchmark exception handling.
</span><span class="cx">
</span><span class="cx"> Reviewed by Ryosuke Niwa.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerhttp_server_driverhttp_servertwisted_http_serverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py (185243 => 185244)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py 2015-06-05 09:11:21 UTC (rev 185243)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py 2015-06-05 09:11:24 UTC (rev 185244)
</span><span class="lines">@@ -1,22 +1,28 @@
</span><span class="cx"> #!/usr/bin/env python
</span><span class="cx">
</span><ins>+import argparse
+import logging
+import sys
+
</ins><span class="cx"> from twisted.web import static, server
</span><span class="cx"> from twisted.web.resource import Resource
</span><span class="cx"> from twisted.internet import reactor
</span><del>-import argparse
-import sys
</del><span class="cx">
</span><ins>+_log = logging.getLogger(__name__)
</ins><span class="cx">
</span><span class="cx"> class ServerControl(Resource):
</span><span class="cx"> isLeaf = True
</span><span class="cx">
</span><span class="cx"> def render_GET(self, request):
</span><ins>+ _log.info("Serving request %s" % request)
</ins><span class="cx"> reactor.stop()
</span><span class="cx"> return ""
</span><span class="cx">
</span><span class="cx"> def render_POST(self, request):
</span><ins>+ _log.info("Serving request %s" % request)
</ins><span class="cx"> sys.stdout.write(request.content.getvalue())
</span><span class="cx"> sys.stdout.flush()
</span><ins>+ reactor.stop()
</ins><span class="cx"> return 'OK'
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerhttp_server_driversimple_http_server_driverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py (185243 => 185244)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py 2015-06-05 09:11:21 UTC (rev 185243)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py 2015-06-05 09:11:24 UTC (rev 185244)
</span><span class="lines">@@ -5,6 +5,7 @@
</span><span class="cx"> import re
</span><span class="cx"> import socket
</span><span class="cx"> import subprocess
</span><ins>+import sys
</ins><span class="cx"> import time
</span><span class="cx">
</span><span class="cx"> from http_server_driver import HTTPServerDriver
</span><span class="lines">@@ -19,23 +20,22 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> def __init__(self):
</span><del>- self.serverProcess = None
- self.serverPort = 0
</del><ins>+ self.server_process = None
+ self.server_port = 0
</ins><span class="cx"> # FIXME: This may not be reliable.
</span><span class="cx"> _log.info('Finding the IP address of current machine')
</span><span class="cx"> try:
</span><span class="cx"> self.ip = [ip for ip in socket.gethostbyname_ex(socket.gethostname())[2] if not ip.startswith("127.")][0]
</span><span class="cx"> _log.info('IP of current machine is: %s' % self.ip)
</span><del>- except:
- _log.error('Cannot get the ip address of current machine')
</del><ins>+ except Exception as error:
+ _log.error('Cannot get the ip address of current machine - Error: %s' % error)
</ins><span class="cx"> raise
</span><span class="cx">
</span><del>- def serve(self, webRoot):
- oldWorkingDirectory = os.getcwd()
- os.chdir(os.path.dirname(os.path.abspath(__file__)))
</del><ins>+ def serve(self, web_root):
</ins><span class="cx"> _log.info('Launching an http server')
</span><del>- self.serverProcess = subprocess.Popen(['/usr/bin/python', 'http_server/twisted_http_server.py', webRoot], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- os.chdir(oldWorkingDirectory)
</del><ins>+ http_server_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "http_server/twisted_http_server.py")
+ self.server_process = subprocess.Popen(["/usr/bin/python", http_server_path, web_root], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
</ins><span class="cx"> maxAttempt = 5
</span><span class="cx"> interval = 0.5
</span><span class="cx"> _log.info('Start to fetching the port number of the http server')
</span><span class="lines">@@ -43,46 +43,57 @@
</span><span class="cx"> import psutil
</span><span class="cx"> for attempt in xrange(maxAttempt):
</span><span class="cx"> try:
</span><del>- self.serverPort = psutil.Process(self.serverProcess.pid).connections()[0][3][1]
- if self.serverPort:
- _log.info('HTTP Server is serving at port: %d', self.serverPort)
</del><ins>+ self.server_port = psutil.Process(self.server_process.pid).connections()[0][3][1]
+ if self.server_port:
+ _log.info('HTTP Server is serving at port: %d', self.server_port)
</ins><span class="cx"> break
</span><span class="cx"> except IndexError:
</span><span class="cx"> pass
</span><span class="cx"> _log.info('Server port is not found this time, retry after %f seconds' % interval)
</span><span class="cx"> time.sleep(interval)
</span><span class="cx"> interval *= 2
</span><ins>+ else:
+ raise Exception("Cannot listen to server, max tries exceeded")
</ins><span class="cx"> except ImportError:
</span><ins>+ for attempt in xrange(maxAttempt):
+ try:
+ output = subprocess.check_output(['/usr/sbin/lsof', '-a', '-iTCP', '-sTCP:LISTEN', '-p', str(self.server_process.pid)])
+ self.server_port = int(re.search('TCP \*:(\d+) \(LISTEN\)', output).group(1))
+ if self.server_port:
+ _log.info('HTTP Server is serving at port: %d', self.server_port)
+ break
+ except Exception as error:
+ _log.info('Error: %s' % error)
+ _log.info('Server port is not found this time, retry after %f seconds' % interval)
+ time.sleep(interval)
+ interval *= 2
+ else:
+ raise Exception("Cannot listen to server, max tries exceeded")
+
+ # Wait for server to be up completely before exiting
+ for attempt in xrange(maxAttempt):
</ins><span class="cx"> try:
</span><del>- for attempt in xrange(maxAttempt):
- try:
- p = subprocess.Popen(' '.join(['/usr/sbin/lsof', '-a', '-iTCP', '-sTCP:LISTEN', '-p', str(self.serverProcess.pid)]), shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- self.serverPort = int(re.findall('TCP \*:(\d+) \(LISTEN\)', p.communicate()[0])[0])
- if self.serverPort:
- _log.info('HTTP Server is serving at port: %d', self.serverPort)
- break
- # Raising exception means the server is not ready to server, try later
- except ValueError:
- pass
- except IndexError:
- pass
- _log.info('Server port is not found this time, retry after %f seconds' % interval)
- time.sleep(interval)
- interval *= 2
- except:
- raise Exception("Server may not be serving")
</del><ins>+ subprocess.check_call(["curl", "--silent", "--head", "--fail", "--output", "/dev/null", self.baseUrl()])
+ return
+ except Exception as error:
+ _log.info('Server not running yet: %s' % error)
+ time.sleep(interval)
+ raise Exception('Server not running, max tries exceeded: %s' % error)
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> def baseUrl(self):
</span><del>- return "http://%s:%d" % (self.ip, self.serverPort)
</del><ins>+ return "http://%s:%d" % (self.ip, self.server_port)
</ins><span class="cx">
</span><span class="cx"> def fetchResult(self):
</span><del>- return self.serverProcess.communicate()[0]
</del><ins>+ (stdout, stderr) = self.server_process.communicate()
+ print stderr
+ return stdout
</ins><span class="cx">
</span><span class="cx"> def killServer(self):
</span><span class="cx"> try:
</span><del>- self.serverProcess.terminate()
- except OSError:
- _log.info('Invalid pid, server may exit properly')
</del><ins>+ self.server_process.terminate()
+ except OSError as error:
+ _log.info('Error terminating server process: %s' % (error))
</ins><span class="cx">
</span><span class="cx"> def getReturnCode(self):
</span><del>- return self.serverProcess.returncode
</del><ins>+ return self.server_process.returncode
</ins></span></pre>
</div>
</div>
</body>
</html>