Changeset 245826 in webkit

Timestamp:

May 28, 2019, 2:55:50 PM (7 years ago)

Author:

Dewei Zhu

Message:

Limit run-benchmark http server to specific interface.
​https://bugs.webkit.org/show_bug.cgi?id=198247

Reviewed by Ryosuke Niwa.

Add '--interface' option to 'twisted_http_server.py'.
'SimpleHTTPServerDriver' should specify interface for http server.
Update regex that determines http server port from 'lsof' output to support ipv6 address.

• Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py:

Added '--interface' argument.

• Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py:

Limited http server to a specific interfce.
Added '-P' option to 'lsof' invocation to inhibits the conversion of port numbers to port name so script won't
fail if it's listening on a 'well-known' port.
Abstracted '_check_http_server_is_running' to allow potential child class to have its own implementation.
(SimpleHTTPServerDriver.serve): Updated regex that determines http server port from 'lsof' output to support ipv6 address.
(SimpleHTTPServerDriver.kill_server): Added null check for 'self._server_process'.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py (modified) (2 diffs)
• Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py (modified) (5 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2019-05-25  Dewei Zhu  <dewei_zhu@apple.com>
+
+        Limit run-benchmark http server to specific interface.
+        https://bugs.webkit.org/show_bug.cgi?id=198247
+
+        Reviewed by Ryosuke Niwa.
+
+        Add '--interface' option to 'twisted_http_server.py'.
+        'SimpleHTTPServerDriver' should specify interface for http server.
+        Update regex that determines http server port from 'lsof' output to support ipv6 address.
+
+        * Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py:
+        Added '--interface' argument.
+        * Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py:
+        Limited http server to a specific interfce.
+        Added '-P' option to 'lsof' invocation to inhibits the conversion of port numbers to port name so script won't
+        fail if it's listening on a 'well-known' port.
+        Abstracted '_check_http_server_is_running' to allow potential child class to have its own implementation.
+        (SimpleHTTPServerDriver.serve): Updated regex that determines http server port from 'lsof' output to support ipv6 address.
+        (SimpleHTTPServerDriver.kill_server): Added null check for 'self._server_process'.
+
 2019-05-28  David Xiong  <w_xiong@apple.com>
 

trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py

@@ -41 +41 @@
     parser.add_argument('web_root')
     parser.add_argument('--port', type=int, default=0)
+    parser.add_argument('--interface', default='')
     args = parser.parse_args()
     web_root = static.File(args.web_root)
@@ -46 +47 @@
     web_root.putChild('shutdown', serverControl)
     web_root.putChild('report', serverControl)
-    reactor.listenTCP(args.port, server.Site(web_root))
+    reactor.listenTCP(args.port, server.Site(web_root), interface=args.interface)
     reactor.run()

trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py

@@ -31 +31 @@
         _log.info('Launching an http server')
         http_server_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "http_server/twisted_http_server.py")
-        self._server_process = subprocess.Popen(["python", http_server_path, web_root], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        interface_args = []
+        if self._ip:
+            interface_args.extend(['--interface', self._ip])
+        self._server_process = subprocess.Popen(["python", http_server_path, web_root] + interface_args, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
 
         max_attempt = 5
@@ -52 +55 @@
             for attempt in xrange(max_attempt):
                 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))
+                    output = subprocess.check_output(['/usr/sbin/lsof', '-a', '-P', '-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)
@@ -64 +67 @@
             else:
                 raise Exception("Cannot listen to server, max tries exceeded")
+        self._wait_for_http_server()
 
+    def _wait_for_http_server(self):
+        max_attempt = 5
         # Wait for server to be up completely before exiting
         for attempt in xrange(max_attempt):
@@ -72 +78 @@
             except Exception as error:
                 _log.info('Server not running yet: %s' % error)
-                time.sleep(interval)
+                time.sleep(1)
         raise Exception('Server not running, max tries exceeded: %s' % error)
 
@@ -85 +91 @@
     def kill_server(self):
         try:
+            if not self._server_process:
+                return
             if self._server_process.poll() is None:
                 self._server_process.terminate()