Changeset 122615 in webkit

Timestamp:

Jul 13, 2012 12:08:27 PM (12 years ago)

Author:

dpranke@chromium.org

Message:

NRWT doesn't print exceptions
​https://bugs.webkit.org/show_bug.cgi?id=91129

Reviewed by Ojan Vafai.

Although we printed exceptions in most cases, if an unexpected
exception (like a runtime error) was raised when creating a
port, we wouldn't. This patch fixes that, and also cleans up
how we were logging exceptions from the workers to be less
verbose.

Because of the corner cases where these errors are occurring,
it's difficult to write automated unit tests for them. I've
tested it quite a bit by hand, though.

• Scripts/webkitpy/common/message_pool.py:

(_MessagePool._close):
(_MessagePool._handle_worker_exception):
(_Worker.run):
(_Worker._raise):

• Scripts/webkitpy/layout_tests/controllers/manager.py:

(Manager._run_tests):

• Scripts/webkitpy/layout_tests/run_webkit_tests.py:

(main):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/message_pool.py (modified) (4 diffs)
• Scripts/webkitpy/layout_tests/controllers/manager.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/run_webkit_tests.py (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-07-13  Dirk Pranke  <dpranke@chromium.org>
+
+        NRWT doesn't print exceptions
+        https://bugs.webkit.org/show_bug.cgi?id=91129
+
+        Reviewed by Ojan Vafai.
+
+        Although we printed exceptions in most cases, if an unexpected
+        exception (like a runtime error) was raised when creating a
+        port, we wouldn't. This patch fixes that, and also cleans up
+        how we were logging exceptions from the workers to be less
+        verbose.
+
+        Because of the corner cases where these errors are occurring,
+        it's difficult to write automated unit tests for them. I've
+        tested it quite a bit by hand, though.
+
+        * Scripts/webkitpy/common/message_pool.py:
+        (_MessagePool._close):
+        (_MessagePool._handle_worker_exception):
+        (_Worker.run):
+        (_Worker._raise):
+        * Scripts/webkitpy/layout_tests/controllers/manager.py:
+        (Manager._run_tests):
+        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+        (main):
+
 2012-07-13  Wei James  <james.wei@intel.com>
 

trunk/Tools/Scripts/webkitpy/common/message_pool.py

@@ -129 +129 @@
         self._workers = []
         if not self._running_inline:
+            # FIXME: This is a hack to get multiprocessing to not log tracebacks during shutdown :(.
+            multiprocessing.util._exiting = True
             if self._messages_to_worker:
                 self._messages_to_worker.close()
@@ -147 +149 @@
         if exception_type == KeyboardInterrupt:
             raise exception_type(exception_value)
-        _log.error("%s raised %s('%s'):" % (
-                   source, exception_value.__class__.__name__, str(exception_value)))
         raise WorkerException(str(exception_value))
 
@@ -246 +246 @@
                     break
 
+            _log.debug("%s exiting" % self.name)
         except Queue.Empty:
             assert False, '%s: ran out of messages in worker queue.' % self.name
         except KeyboardInterrupt, e:
-            exception_msg = ", interrupted"
-            if not self._running_inline:
-                _log.warning('worker exception')
-                self._raise(sys.exc_info())
-            raise
+            self._raise(sys.exc_info())
         except Exception, e:
-            exception_msg = ", exception raised: %s" % str(e)
-            if not self._running_inline:
-                self._raise(sys.exc_info())
-            raise
+            self._raise(sys.exc_info())
         finally:
-            _log.debug("%s exiting%s" % (self.name, exception_msg))
             try:
                 worker.stop()
@@ -280 +273 @@
 
     def _raise(self, exc_info):
+        exception_type, exception_value, exception_traceback = exc_info
+        if self._running_inline:
+            raise exception_type, exception_value, exception_traceback
+
+        if exception_type == KeyboardInterrupt:
+            _log.debug("%s: interrupted, exiting" % self.name)
+            stack_utils.log_traceback(_log.debug, exception_traceback)
+        else:
+            _log.error("%s: %s('%s') raised:" % (self.name, exception_value.__class__.__name__, str(exception_value)))
+            stack_utils.log_traceback(_log.error, exception_traceback)
         # Since tracebacks aren't picklable, send the extracted stack instead.
-        exception_type, exception_value, exception_traceback = exc_info
-        stack_utils.log_traceback(_log.error, exception_traceback)
         stack = traceback.extract_tb(exception_traceback)
         self._post(name='worker_exception', args=(exception_type, exception_value, stack), from_user=False)

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

@@ -783 +783 @@
             _log.warning(e.reason)
             interrupted = True
-        except:
-            _log.error("Exception raised, exiting")
+        except Exception, e:
+            _log.debug('%s("%s") raised, exiting' % (e.__class__.__name__, str(e)))
             raise
         finally:

trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py

@@ -36 +36 @@
 import signal
 import sys
+import traceback
 
 from webkitpy.common.host import Host
@@ -470 +471 @@
         print >> sys.stderr, str(e)
         return EXCEPTIONAL_EXIT_STATUS
+    except:
+        traceback.print_exc(file=sys.stderr)
+        raise
 
     logging.getLogger().setLevel(logging.DEBUG if options.verbose else logging.INFO)
@@ -478 +482 @@
     try:
         sys.exit(main())
-    except Exception, e:
+    except BaseException, e:
         if e.__class__ in (KeyboardInterrupt, TestRunInterruptedException):
             sys.exit(INTERRUPTED_EXIT_STATUS)