Title: [278638] trunk/Tools
- Revision
- 278638
- Author
- [email protected]
- Date
- 2021-06-08 18:12:12 -0700 (Tue, 08 Jun 2021)
Log 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):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (278637 => 278638)
--- trunk/Tools/ChangeLog 2021-06-09 01:10:32 UTC (rev 278637)
+++ trunk/Tools/ChangeLog 2021-06-09 01:12:12 UTC (rev 278638)
@@ -1,3 +1,19 @@
+2021-06-08 Dewei Zhu <[email protected]>
+
+ 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 <[email protected]>
run-webkit-tests: TaskPool reports PicklingError for Windows Python
Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py (278637 => 278638)
--- trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py 2021-06-09 01:10:32 UTC (rev 278637)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py 2021-06-09 01:12:12 UTC (rev 278638)
@@ -11,7 +11,6 @@
if script_dir not in sys.path:
sys.path.insert(0, script_dir)
-from pkg_resources import require, VersionConflict, DistributionNotFound
from webkitpy.autoinstalled import twisted
from twisted.web import static, server
Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py (278637 => 278638)
--- trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py 2021-06-09 01:10:32 UTC (rev 278637)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py 2021-06-09 01:12:12 UTC (rev 278638)
@@ -33,15 +33,19 @@
interface_args.extend(['--interface', self._ip])
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
else:
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
