Merge remote branch 'cros/upstream' into master

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 244 matching lines @@
             autoserv_argv += ['--image', job.update_image_path]
     if verbose:
         autoserv_argv.append('--verbose')
     return autoserv_argv + extra_args
 
 
 class SchedulerError(Exception):
     """Raised by HostScheduler when an inconsistent state occurs."""
 
 
-class HostScheduler(metahost_scheduler.HostSchedulingUtility):
+class BaseHostScheduler(metahost_scheduler.HostSchedulingUtility):
     """Handles the logic for choosing when to run jobs and on which hosts.
 
     This class makes several queries to the database on each tick, building up
     some auxiliary data structures and using them to determine which hosts are
     eligible to run which jobs, taking into account all the various factors that
     affect that.
 
     In the past this was done with one or two very large, complex database
     queries.  It has proven much simpler and faster to build these auxiliary
     data structures and perform the logic in Python.
@@ skipping 382 matching lines @@
             host_list = []
             for host in eligible_hosts_in_group:
                 hosts_in_label.discard(host.id)
                 self._hosts_available.pop(host.id)
                 host_list.append(host)
             return host_list
 
         return []
 
 
+site_host_scheduler = utils.import_site_class(__file__,
+                                  "autotest_lib.scheduler.site_host_scheduler",
+                                  "site_host_scheduler", BaseHostScheduler)
+
+
+class HostScheduler(site_host_scheduler):
+    pass
+
+
 class Dispatcher(object):
     def __init__(self):
         self._agents = []
         self._last_clean_time = time.time()
         self._host_scheduler = HostScheduler()
         user_cleanup_time = scheduler_config.config.clean_interval
         self._periodic_cleanup = monitor_db_cleanup.UserCleanup(
             _db, user_cleanup_time)
         self._24hr_upkeep = monitor_db_cleanup.TwentyFourHourUpkeep(_db)
         self._host_agents = {}
@@ skipping 1922 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()