Merge remote branch 'cros/upstream' into tempbranch

scheduler/drone_utility.py

 #!/usr/bin/python
 
 import pickle, subprocess, os, shutil, socket, sys, time, signal, getpass
 import datetime, traceback, tempfile, itertools, logging
 import common
 from autotest_lib.client.common_lib import utils, global_config, error
 from autotest_lib.server import hosts, subcommand
 from autotest_lib.scheduler import email_manager, scheduler_config
 
 # An environment variable we add to the environment to enable us to
@@ skipping 85 matching lines @@
             ['/bin/ps', 'x', '-o', ','.join(cls._PS_ARGS)],
             stdout=subprocess.PIPE)
         ps_output = ps_proc.communicate()[0]
 
         # split each line into the columns output by ps
         split_lines = [line.split(None, 4) for line in ps_output.splitlines()]
         return (dict(itertools.izip(cls._PS_ARGS, line_components))
                 for line_components in split_lines)
 
 
-    def _refresh_processes(self, command_name, open=open):
+    def _refresh_processes(self, command_name, open=open,
+                           site_check_parse=None):
         # The open argument is used for test injection.
         check_mark = global_config.global_config.get_config_value(
             'SCHEDULER', 'check_processes_for_dark_mark', bool, False)
         processes = []
         for info in self._get_process_info():
-            if info['comm'] == command_name:
+            is_parse = (site_check_parse and site_check_parse(info))
+            if info['comm'] == command_name or is_parse:
                 if (check_mark and not
                         self._check_pid_for_dark_mark(info['pid'], open=open)):
                     self._warn('%(comm)s process pid %(pid)s has no '
                                'dark mark; ignoring.' % info)
                     continue
                 processes.append(info)
 
         return processes
 
 
@@ skipping 18 matching lines @@
         Returns a dict containing:
         * pidfiles: dict mapping pidfile paths to file contents, for pidfiles
         that exist.
         * autoserv_processes: list of dicts corresponding to running autoserv
         processes.  each dict contain pid, pgid, ppid, comm, and args (see
         "man ps" for details).
         * parse_processes: likewise, for parse processes.
         * pidfiles_second_read: same info as pidfiles, but gathered after the
         processes are scanned.
         """
+        site_check_parse = utils.import_site_function(
+                __file__, 'autotest_lib.scheduler.site_drone_utility',
+                'check_parse', lambda x: False)
         results = {
             'pidfiles' : self._read_pidfiles(pidfile_paths),
             'autoserv_processes' : self._refresh_processes('autoserv'),
-            'parse_processes' : self._refresh_processes('parse'),
+            'parse_processes' : self._refresh_processes(
+                    'parse', site_check_parse=site_check_parse),
             'pidfiles_second_read' : self._read_pidfiles(pidfile_paths),
         }
         return results
 
 
     def kill_process(self, process):
         signal_queue = (signal.SIGCONT, signal.SIGTERM, signal.SIGKILL)
         utils.nuke_pid(process.pid, signal_queue=signal_queue)
 
 
@@ skipping 254 matching lines @@
 
 def main():
     calls = parse_input()
     drone_utility = DroneUtility()
     return_value = drone_utility.execute_calls(calls)
     return_data(return_value)
 
 
 if __name__ == '__main__':
     main()