Leaks builders exit early frequently

https://bugs.webkit.org/show_bug.cgi?id=116355

Reviewed by Stephanie Lewis.

Throttle the number of processes to use, and also bump up the number of crashes/timeouts
we tolerate from 20 to 50.

* BuildSlaveSupport/build.webkit.org-config/master.cfg:
(RunWebKitTests.start):
* Scripts/webkitpy/port/mac.py:
(MacPort.default_child_processes):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@150303 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg b/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
index 85198c9acb02e44008c0ed3a24ad8a88c0d707fb..1d07c889ad6b259ec5238e0c8d735e657c2ca62a 100644 (file)
--- a/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
+++ b/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg
@@ -313,7 +313,7 @@ class RunWebKitTests(shell.Test):
         if platform.startswith('mac'):
             self.setCommand(self.command + ['--no-build'])
         if shouldAbortEarly:
-            self.setCommand(self.command + ["--exit-after-n-crashes-or-timeouts", "20", "--exit-after-n-failures", "500"])
+            self.setCommand(self.command + ["--exit-after-n-crashes-or-timeouts", "50", "--exit-after-n-failures", "500"])
         if platform == "win":
             rootArgument = ['--root=' + os.path.join("WebKitBuild", self.getProperty('configuration'), "bin")]
             self.setCommand(self.command + ['--no-build', '--use-remote-links-to-tests'])

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index d59fdff691e9159c01e66801701a2977ec3eb0d6..39a4bbc053856f8e09ee461edbaa055a5bef513b 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,18 @@
+2013-05-17  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Leaks builders exit early frequently
+        https://bugs.webkit.org/show_bug.cgi?id=116355
+
+        Reviewed by Stephanie Lewis.
+
+        Throttle the number of processes to use, and also bump up the number of crashes/timeouts
+        we tolerate from 20 to 50.
+
+        * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+        (RunWebKitTests.start):
+        * Scripts/webkitpy/port/mac.py:
+        (MacPort.default_child_processes):
+
 2013-05-17  Peter Gal  <galpeter@inf.u-szeged.hu>
 
         Remove chrome-channels command from the webkit-patch

diff --git a/Tools/Scripts/webkitpy/port/mac.py b/Tools/Scripts/webkitpy/port/mac.py
index bd4d40572983498adc30d701e276c58d04286143..913905b2831d2089d5c42741fbef2779f677a66a 100644 (file)
--- a/Tools/Scripts/webkitpy/port/mac.py
+++ b/Tools/Scripts/webkitpy/port/mac.py
@@ -121,7 +121,9 @@ class MacPort(ApplePort):
         # FIXME: https://bugs.webkit.org/show_bug.cgi?id=95906  With too many WebProcess WK2 tests get stuck in resource contention.
         # To alleviate the issue reduce the number of running processes
         # Anecdotal evidence suggests that a 4 core/8 core logical machine may run into this, but that a 2 core/4 core logical machine does not.
-        if self.get_option('webkit_test_runner') and default_count > 4:
+        should_throttle_for_wk2 = self.get_option('webkit_test_runner') and default_count > 4
+        # We also want to throttle for leaks bots.
+        if should_throttle_for_wk2 or self.get_option('leaks'):
             default_count = int(.75 * default_count)
 
         # Make sure we have enough ram to support that many instances: