Changeset 278638 in webkit

Timestamp:

Jun 8, 2021, 6:12:12 PM (5 years ago)

Author:

Dewei Zhu

Message:

Increase http server launch timeout on run-benchmark script.
​https://bugs.webkit.org/show_bug.cgi?id=226801

Reviewed by Ryosuke Niwa.

Installing twisted module in http server may take longer than 7.5 seconds.
Increase the timeout to be 31.5 seconds and add an early terminate if http server
process is not running.

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

Removed unused import.

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

(SimpleHTTPServerDriver.serve):

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2021-06-08  Dewei Zhu  <dewei_zhu@apple.com>
+
+        Increase http server launch timeout on run-benchmark script.
+        https://bugs.webkit.org/show_bug.cgi?id=226801
+
+        Reviewed by Ryosuke Niwa.
+
+        Installing twisted module in http server may take longer than 7.5 seconds.
+        Increase the timeout to be 31.5 seconds and add an early terminate if http server
+        process is not running.
+
+        * Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py:
+        Removed unused import.
+        * Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py:
+        (SimpleHTTPServerDriver.serve):
+
 2021-06-08  Fujii Hironori  <Hironori.Fujii@sony.com>
 

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

@@ -12 +12 @@
     sys.path.insert(0, script_dir)
 
-from pkg_resources import require, VersionConflict, DistributionNotFound
 from webkitpy.autoinstalled import twisted
 

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

@@ -34 +34 @@
         self._server_port = 0
         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
+        max_attempt = 7
+        retry_sequence = map(lambda attempt: attempt != max_attempt - 1, range(max_attempt))
         interval = 0.5
         _log.info('Start to fetching the port number of the http server')
-        for attempt in range(max_attempt):
+        for retry in retry_sequence:
             self._find_http_server_port()
             if self._server_port:
                 _log.info('HTTP Server is serving at port: %d', self._server_port)
                 break
-            _log.info('Server port is not found this time, retry after %f seconds' % interval)
+            assert self._server_process.poll() is None, 'HTTP Server Process is not running'
+            if not retry:
+                continue
+            _log.info('Server port is not found this time, retry after {} seconds'.format(interval))
             time.sleep(interval)
             interval *= 2