Changeset 267354 in webkit

Timestamp:

Sep 21, 2020, 12:31:35 PM (6 years ago)

Author:

commit-queue@webkit.org

Message:

Increase the maximum number of open files for wpt's servers
​https://bugs.webkit.org/show_bug.cgi?id=215829

Patch by Sam Sneddon <Sam Sneddon> on 2020-09-21
Reviewed by Youenn Fablet.

macOS has a much lower limits than other OSes by default, and the iOS bots often run into it with their level of parallel test execution. This bumps the limit for each wptserve process up to 2048, which is double the limit on Debian, and should probably be safe.

• web-platform-tests/tools/serve/serve.py:

(ServerProc.create_daemon):

Location:

trunk/LayoutTests/imported/w3c

Files:

• ChangeLog (modified) (1 diff)
• web-platform-tests/tools/serve/serve.py (modified) (2 diffs)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2020-09-21  Sam Sneddon  <gsnedders@apple.com>
+
+        Increase the maximum number of open files for wpt's servers
+        https://bugs.webkit.org/show_bug.cgi?id=215829
+
+        Reviewed by Youenn Fablet.
+
+        macOS has a much lower limits than other OSes by default, and the iOS bots often run into it with their level of parallel test execution. This bumps the limit for each wptserve process up to 2048, which is double the limit on Debian, and should probably be safe.
+
+        * web-platform-tests/tools/serve/serve.py:
+        (ServerProc.create_daemon):
+
 2020-09-20  Sam Weinig  <weinig@apple.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/tools/serve/serve.py

@@ -9 +9 @@
 import os
 import platform
+import resource
 import signal
 import socket
+import subprocess
 import sys
 import threading
@@ -417 +419 @@
     def create_daemon(self, init_func, host, port, paths, routes, bind_address,
                       config, **kwargs):
+        if sys.platform == "darwin":
+            # on Darwin, NOFILE starts with a very low limit (256), so bump it up a little
+            # by way of comparison, Debian starts with a limit of 1024, Windows 512
+            maxfilesperproc = int(subprocess.check_output(
+                ["sysctl", "-n", "kern.maxfilesperproc"]
+            ).strip())
+            soft, hard = resource.getrlimit(resource.RLIMIT_NOFILE)
+            # 2048 is somewhat arbitrary, but gives us some headroom for wptrunner --parallel
+            # note that it's expected that 2048 will be the min here
+            new_soft = min(2048, maxfilesperproc, hard)
+            if soft < new_soft:
+                resource.setrlimit(resource.RLIMIT_NOFILE, (new_soft, hard))
         try:
             self.daemon = init_func(host, port, paths, routes, bind_address, config, **kwargs)