commit 280f01acfd815fe06654b539b1f09492a2dc88ff
author Aviv Keshet <akeshet@chromium.org> Fri Apr 28 10:09:08 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Apr 28 10:09:08 2017 +0000
tree 41c1f44c0dccb762e004ace8c1a5414242ebefd9
parent 534bd96147c4fc9e505d1f569dbeabbac6b7ceac
parent 7f73f66cba0663aa6bda605f296c94239d97a997

autotest: replace scheduler uncaught exception spam with counter
am: 7f73f66cba

Change-Id: I06bcfafb9ba643c3778b110142464ee77b212cc7

scheduler/host_scheduler.py

diff --git a/scheduler/host_scheduler.py b/scheduler/host_scheduler.py
index 95b6b2a..d18aeaf 100755
--- a/scheduler/host_scheduler.py
+++ b/scheduler/host_scheduler.py
@@ -501,8 +501,7 @@
         # for host-scheduler role. Thus do not send email for it.
         raise
     except Exception:
-        email_manager.manager.log_stacktrace(
-                'Uncaught exception; terminating host_scheduler.')
+        metrics('%s/uncaught_exception' % _METRICS_PREFIX).increment()
         raise
     finally:
         email_manager.manager.send_queued_emails()

scheduler/monitor_db.py

diff --git a/scheduler/monitor_db.py b/scheduler/monitor_db.py
index 6e7870a..7a8fad1 100755
--- a/scheduler/monitor_db.py
+++ b/scheduler/monitor_db.py
@@ -193,8 +193,8 @@
           # for scheduler role. Thus do not send email for it.
           logging.exception(e)
       except Exception:
-          email_manager.manager.log_stacktrace(
-              "Uncaught exception; terminating monitor_db")
+          metrics.Counter('chromeos/autotest/scheduler/uncaught_exception'
+                          ).increment()
 
     metadata_reporter.abort()
     email_manager.manager.send_queued_emails()