Changeset 90246 in webkit

Timestamp:

Jul 1, 2011 11:14:37 AM (13 years ago)

Author:

abarth@webkit.org

Message:

2011-07-01 Adam Barth <​abarth@webkit.org>

Reviewed by Darin Adler.

ReportCrash destabilizes new-run-webkit-tests
​https://bugs.webkit.org/show_bug.cgi?id=63795

ReportCrash chews up too many system resources that it destablizes
tests run concurrently. This patch causes us to spin down all the
worker processes when ReportCrash is running.

Also, this patch causes the master process to tell the user we're
waiting for the crash reporter rather than having that be the worker's
job. This stops the user from getting spammed with too many "waiting
for crash reporter" messages and also cleans up some minor UI issues
with the meter.

• Scripts/webkitpy/layout_tests/layout_package/manager.py:
• Scripts/webkitpy/layout_tests/layout_package/single_test_runner.py:
• Scripts/webkitpy/layout_tests/port/base.py:
• Scripts/webkitpy/layout_tests/port/server_process.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/layout_package/manager.py (modified) (2 diffs)
• Scripts/webkitpy/layout_tests/layout_package/single_test_runner.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/base.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/server_process.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-07-01  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        ReportCrash destabilizes new-run-webkit-tests
+        https://bugs.webkit.org/show_bug.cgi?id=63795
+
+        ReportCrash chews up too many system resources that it destablizes
+        tests run concurrently.  This patch causes us to spin down all the
+        worker processes when ReportCrash is running.
+
+        Also, this patch causes the master process to tell the user we're
+        waiting for the crash reporter rather than having that be the worker's
+        job.  This stops the user from getting spammed with too many "waiting
+        for crash reporter" messages and also cleans up some minor UI issues
+        with the meter.
+
+        * Scripts/webkitpy/layout_tests/layout_package/manager.py:
+        * Scripts/webkitpy/layout_tests/layout_package/single_test_runner.py:
+        * Scripts/webkitpy/layout_tests/port/base.py:
+        * Scripts/webkitpy/layout_tests/port/server_process.py:
+
 2011-07-01  Adam Roben  <aroben@apple.com>
 

trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/manager.py

@@ -669 +669 @@
         try:
             while not self.is_done():
-                # FIXME: Do we need to run in a loop anymore?
+                if self._port.executive().running_pids(self._port.is_crash_reporter):
+                    self._printer.print_update("Waiting for crash reporter ...")
+                    self._port.executive().wait_newest(self._port.is_crash_reporter)
                 manager_connection.run_message_loop(delay_secs=1.0)
 
@@ -783 +785 @@
         start_time = time.time()
 
-        interrupted, keyboard_interrupted, thread_timings, test_timings, \
-            individual_test_timings = (
-            self._run_tests(self._test_files_list, result_summary))
+        interrupted, keyboard_interrupted, thread_timings, test_timings, individual_test_timings = self._run_tests(self._test_files_list, result_summary)
 
         # We exclude the crashes from the list of results to retry, because

trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/single_test_runner.py

@@ -126 +126 @@
 
     def _run_compare_test(self):
+        # Before running the test, we wait for any crash reporters to finish
+        # running. On Mac, ReportCrash chews up a bunch of resources and
+        # causes the tests to become unstable, so we don't want to run in
+        # parallel with ReportCrash.
+        self._port.executive().wait_newest(self._port.is_crash_reporter)
         driver_output = self._driver.run_test(self._driver_input())
         expected_driver_output = self._expected_driver_output()

trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py

@@ -139 +139 @@
         self.set_option_default('use_apache', self._default_to_apache())
 
+    def executive(self):
+        return self._executive
+
     def wdiff_available(self):
         if self._wdiff_available is None:

trunk/Tools/Scripts/webkitpy/layout_tests/port/server_process.py

@@ -173 +173 @@
             return
         try:
-            self._log('Sampling %s process... (use --no-sample-on-timeout to skip this step)' % self._name)
             hang_report = os.path.join(self._port.results_directory(), "%s-%s.sample.txt" % (self._name, self._proc.pid))
             self._executive.run_command([
@@ -198 +197 @@
             now = time.time()
             if now > deadline:
-                if self._executive.running_pids(self._port.is_crash_reporter):
-                    self._log('Waiting for crash reporter...')
-                    self._executive.wait_newest(self._port.is_crash_reporter)
-                    if not self.crashed:
-                        self._check_for_crash()
+                self._executive.wait_newest(self._port.is_crash_reporter)
+                if not self.crashed:
+                    self._check_for_crash()
                 self.timed_out = True
                 if not self.crashed: