Merge remote branch 'cros/upstream' into tempbranch

scheduler/monitor_db.py

 #!/usr/bin/python -u
 
 """
 Autotest scheduler
 """
 
 
 import common
 import datetime, errno, optparse, os, pwd, Queue, re, shutil, signal
 import smtplib, socket, stat, subprocess, sys, tempfile, time, traceback, urllib
@@ skipping 35 matching lines @@
 # error message to leave in results dir when an autoserv process disappears
 # mysteriously
 _LOST_PROCESS_ERROR = """\
 Autoserv failed abnormally during execution for this job, probably due to a
 system error on the Autotest server.  Full results may not be available.  Sorry.
 """
 
 _db = None
 _shutdown = False
 _autoserv_path = os.path.join(drones.AUTOTEST_INSTALL_DIR, 'server', 'autoserv')
-_parser_path = os.path.join(drones.AUTOTEST_INSTALL_DIR, 'tko', 'parse')
 _testing_mode = False
 _drone_manager = None
 
+def _parser_path_default(install_dir):
+    return os.path.join(install_dir, 'tko', 'parse')
+_parser_path_func = utils.import_site_function(
+        __file__, 'autotest_lib.scheduler.site_monitor_db',
+        'parser_path', _parser_path_default)
+_parser_path = _parser_path_func(drones.AUTOTEST_INSTALL_DIR)
+
 
 def _get_pidfile_timeout_secs():
     """@returns How long to wait for autoserv to write pidfile."""
     pidfile_timeout_mins = global_config.global_config.get_config_value(
             scheduler_config.CONFIG_SECTION, 'pidfile_timeout_mins', type=int)
     return pidfile_timeout_mins * 60
 
 
 def _site_init_monitor_db_dummy():
     return {}
@@ skipping 2522 matching lines @@
             paired_process = self._paired_with_monitor().get_process()
             _drone_manager.write_lines_to_file(
                     failed_file, ['Archiving failed with exit code %s'
                                   % self.monitor.exit_code()],
                     paired_with_process=paired_process)
         self._set_all_statuses(self._final_status())
 
 
 if __name__ == '__main__':
     main()