commit 80dae19c61b8d7f7a8f0f3d567b21c4f88eb9c7c
author Allen Li <ayatane@chromium.org> Tue Nov 01 11:58:10 2016 -0700
committer Allen Li <ayatane@chromium.org> Tue Nov 22 00:34:08 2016 +0000
tree 60d22548b2e7a49c1d99b2a381e1c2edf92ede63
parent 6e21d3f52240c01959ec6d5209e8fbcbd1f3158a

[sysmon] Fix autoserv process counting

1. Fix oversight of shebang scripts keeping their command name.
2. Don’t count forked autoserv process
3. The venv is using a different version of psutil with different API.

BUG=chromium:659308
TEST=Run sysmon on test drone

Change-Id: I892a981868246b3ea2564aa147b5613c1c17885d
Reviewed-on: https://chromium-review.googlesource.com/405775
Tested-by: Allen Li <ayatane@chromium.org>
Reviewed-by: Dan Shi <dshi@google.com>

scripts/sysmon/system_metrics.py

diff --git a/scripts/sysmon/system_metrics.py b/scripts/sysmon/system_metrics.py
index d657ecf..3d1778f 100644
--- a/scripts/sysmon/system_metrics.py
+++ b/scripts/sysmon/system_metrics.py
@@ -307,7 +307,7 @@
   autoserv_count = 0
   total = 0
   for proc in psutil.process_iter():
-    if _is_autoserv_proc(proc):
+    if _is_parent_autoserv(proc):
       autoserv_count += 1
     total += 1
   logging.debug('autoserv_count: %s', autoserv_count)
@@ -315,10 +315,17 @@
   _proc_count_metric.set(total)
 
 
-def _is_autoserv_proc(proc):
-  return (
-      proc.name == 'python'
-      and '/usr/local/autotest/server/autoserv' in proc.cmdline)
+def _is_parent_autoserv(proc):
+  """Return whether proc is a parent (not forked) autoserv process."""
+  return _is_autoserv(proc) and not _is_autoserv(proc.parent())
+
+
+def _is_autoserv(proc):
+  """Return whether proc is an autoserv process."""
+  # This relies on the autoserv script being run directly.  The script should
+  # be named autoserv exactly and start with a shebang that is /usr/bin/python,
+  # NOT /bin/env
+  return proc.name() == 'autoserv'
 
 
 def get_load_avg():